yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,938 Commits 4 Branches 7 Tags
c5000b965607a7e8ffbf74b4f2a09b7002a63ed7
Commit Graph

181 Commits

Author SHA1 Message Date
Shannon
09b68a75be Simplifies the IContentSection so that there's no nesting of interface classes and updates some unit tests 2013-09-16 15:52:59 +10:00
Shannon
81b43545c1 Updated the remainder of the legacy UmbracoSettings calls to use the new format, now to just fix up the unit tests 2013-09-16 12:36:12 +10:00
Shannon
e962e86c3c Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/MemberReadOnlyDto.cs
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-09-10 11:49:05 +10:00
Sebastiaan Janssen
686250c586 Fixed U4-608 Empty tinymce config throws null ref exception 2013-09-08 19:42:34 +02:00
Shannon
339ee11dc0 Completes U4-2744 Remove very old TinyMCE 2 and all that is related to it 2013-08-29 17:45:16 +10:00
Shannon
f7e7687f27 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/TypeFinder.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
 2013-08-29 15:18:19 +10:00
Shannon
357dc6ec8e Fixes: U4-2711 DAMP throws unknown exception on image upload with image cropper 2013-08-29 12:27:49 +10:00
Shannon
c3619d9ac5 Fixes plugin mgr to not resolve types that shouldn't be resolved. Fixes mntp legacy editor to not throw exceptions when initializing because the legacy tree no longer exists. Fixes authentication when an invalid cookie is detected. 2013-08-14 13:38:28 +10:00
Shannon
d7fd1efd60 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Tests/Models/ContentExtensionsTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
 2013-08-13 18:22:45 +10:00
Morten Christensen
86811fe507 Fixes U4-2397 IContent Properties added with incorrect Value when read from Cache, and adds unit test for verifying types saved and returned for 24 standard DataTypes. 2013-08-12 16:20:32 +02:00
Shannon
500d25fd5a Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
 2013-07-24 13:10:43 +10:00
Sebastiaan Janssen
e634dba4ea 2nd attempt: U4-2514 Checkboxlist prevalues in packages broken 2013-07-23 13:16:18 +02:00
Shannon
4df80eb976 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-07-23 13:41:42 +10:00
Shannon
3da7682415 reverted change for U4-2514 as this change will cause other unwanted problems. Added logging for DefaultDataKeyValue instead of blindly swallowing an exception. 2013-07-23 10:50:48 +10:00
Sebastiaan Janssen
319ba5c791 U4-2524 If tinyMCEImageHelper.DoResize fails, the src gets removed from the img tag 2013-07-22 13:51:13 +02:00
Shannon
80f8a9d01c Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-22 12:44:06 +10:00
Shannon
6f9883d373 Fixes MNTP required validation (U4-1975) 2013-07-22 12:30:12 +10:00
Shannon
41c920a4ec Updated to latest CDF version which contains some fixes. 2013-07-22 11:29:32 +10:00
Sebastiaan Janssen
914005b2b6 Merge pull request #46 from michielvoo/u4-2417 
U4-2417 Could the preview thumbnail link to the full image
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
	src/umbraco.editorControls/mediapicker/mediaChooser.cs
 2013-07-19 15:09:07 +02:00
Sebastiaan Janssen
d88494e90e U4-638 Bug (and fix/solution): Saving inline base64 image (or any attribute value with equal sign at the end) 2013-07-18 17:09:26 +02:00
Shannon
deceec3fa2 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.businesslogic/packages.config
	src/umbraco.cms/Actions/ActionNew.cs
 2013-07-12 11:03:49 +10:00
Morten Christensen
93def731ef Fixes #U4-2466 2013-07-05 10:51:19 +02:00
Morten Christensen
f06a6f42da Updating nuget dependency for ClientDependency 2013-07-03 11:20:42 +02:00
Shannon Deminick
76bbdcd32c Merge with 6.1.2 2013-06-03 13:36:40 -10:00
Shannon Deminick
932115585e Fixes: #U4-2315 - CDF grouping issue, updated to new version 2013-06-03 13:35:41 -10:00
Morten Christensen
242443d861 Fixes the EntityRepository for Content and Media, so trees load correctly. 
Fixes U4-2306
Fixes loading of MNTP.
FolderBrowser is now able to show multiple images on a single media item.
FolderBrowser only shows images and not containers.
 2013-06-01 20:40:51 -02:00
Sebastiaan Janssen
8c841f97cc Merge with 6.0.7 2013-05-31 05:57:18 -02:00
Sebastiaan Janssen
a1ee352514 Additional fix for U4-335 Image cropper out of memory 2013-05-31 05:46:10 -02:00
Shannon Deminick
302b3c3750 Fixed some build problems, replaces all calls to the legacy/obsolete data type factory to the DataTypesResolver and removes test for DataTypeFactoryTests. 
Updates data type editor to show legacy data types at the bottom and the new Property editors at the top. Updated the data type editor to use the new api
so that we can test assigning Belle property editors to data types (pre-values have not been converted though). #U4-2289
 2013-05-28 15:54:19 -10:00
Shannon Deminick
522d909d37 Merge with 6.1.0 2013-05-28 14:20:43 -10:00
Shannon Deminick
5041e6fcc4 Updated to latest CDF version that has a few bug fixes and added a CDF logger. 2013-05-28 13:24:48 -10:00
Shannon Deminick
8b841e19eb Upgrades required projects to .Net 4.5 2013-05-26 13:33:43 -10:00
Shannon Deminick
de52f3ee93 Merge with 6.0.6 2013-05-05 23:39:52 -10:00
Sebastiaan Janssen
2423bdd623 Merge with 4.11.8 2013-05-01 05:33:19 -02:00
Sebastiaan Janssen
bcb90d64a5 Fixes U4-1136 Class in MediaPickerDataType.cs wrongly named MemberPickerDataType 
+ a bit of code cleanup
 2013-05-01 05:32:29 -02:00
Shannon Deminick
710c8aa6ea Merge with 6.0.4 2013-04-23 21:52:07 -10:00
Shannon Deminick
df9a887032 Merge with 4.11.7 2013-04-23 20:50:30 -10:00
agrath
3594693f4b Backported fix for u4-335 from Commit b15d0ab0b879 into 4.11.7 2013-04-22 11:12:03 -12:00
Shannon Deminick
d6d630cb2c Merge with 6.0.4 2013-04-19 04:40:49 +06:00
Shannon Deminick
35a698cdc9 Merge with 4.11.7 2013-04-19 04:40:13 +06:00
Shannon Deminick
c0fd974cc1 fixes typo on word disallow 2013-04-19 04:20:24 +06:00
Shannon Deminick
979fe46e9b Updated CDF to 1.6.0.0 2013-04-18 00:55:40 +06:00
Shannon Deminick
22fb7e1706 Merge 2013-04-12 03:07:53 +06:00
Shannon Deminick
12b1168de9 Fixes merge issues 2013-04-12 02:59:03 +06:00
Shannon Deminick
01290f8174 Merge with 4.11.7 2013-04-12 02:14:59 +06:00
Shannon Deminick
26a7bf8187 Fixes: #U4-2087 2013-04-12 02:11:01 +06:00
Sebastiaan Janssen
ba1d0fa193 Improve code for previous fix so we don't need the try/catch any more. 2013-04-11 16:36:26 -02:00
Sebastiaan Janssen
97355bde6f Fixes U4-2091 Inserting image in RTE with mediatype "File" causes YSOD 2013-04-11 13:15:08 -02:00
Shannon Deminick
4ef9dbb9b4 Merge 2013-04-12 03:07:30 +06:00
Shannon Deminick
f716ba380c Merge with 6.0.4 2013-04-12 03:02:40 +06:00