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

29 Commits

Author SHA1 Message Date
Shannon
24e2547656 Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b 
# Conflicts:
#	src/Umbraco.Core/Models/Rdbms/UserGroup2NodePermissionDto.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
#	src/Umbraco.Core/Persistence/RepositoryFactory.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/SectionService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2017-05-04 18:29:43 +10:00
Sebastiaan Janssen
ee3a4614c3 Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks 2016-11-26 18:02:57 +01:00
AndyButland
b1800305b8 Removed user types and migrated them to groups. Returned to compiling state. 2016-10-28 09:20:52 +02:00
Shannon
70a1704b35 Completes U4-2929 Finish obsoleting the remaining legacy property editors 2013-10-21 18:36:46 +11:00
Shannon
1e9a17babe Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen. 2013-09-25 19:23:41 +10:00
Shannon
a939c14de9 Completes: U4-2917 Remove canvas/live editing support, U4-2916 Remove skinning support 2013-09-25 17:57:44 +10:00
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
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
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
leekelleher
2cd64dd540 Missed a few TinyMCE GUID references, (due to their string format). 2013-03-14 22:15:39 +00:00
Shannon Deminick
e2d806f5d9 Merge with 4.11.5 2013-02-22 20:00:10 +06:00
Sebastiaan Janssen
4648a8c103 Fixes U4-1746 Duplicate image source (src) when inserting resized image in tiny 
mce (richtext editor)
 2013-02-22 11:41:01 -01:00
Sebastiaan Janssen
2df05da7fc Fixes U4-1746 Duplicate image source (src) when inserting resized image in tiny 
mce (richtext editor)
 2013-02-22 11:41:01 -01:00
Sebastiaan Janssen
937fc423ad Change word deprecated to obsolete 2013-01-08 13:27:16 -01:00
Sebastiaan Janssen
8ef6ca73f6 Merge with 4.11.2 2012-12-28 09:02:45 -01:00
Sebastiaan Janssen
48d620cdb0 Cleanup RTE ImageHelper a little bit, still bad code but more readable now 2012-12-26 06:27:30 -01:00
Sebastiaan Janssen
3bd487d092 Fixed #U4-1323 Stripping umbraco path out of source is not needed any more 2012-12-26 05:54:34 -01:00
Shannon Deminick
56b70ad229 Updated a ton of Error logging calls to use the new LogHelper but there are still plenty more to go; #u4-7 2012-12-10 05:03:28 +05:00
Shannon Deminick
67d9e578f5 Fixes: #U4-919, we will just use real classes for extension methods and all custom file systems like the MediaFileSystem must inherit from 
FileSystemWrapper
 2012-11-07 09:30:40 +05:00
Shannon Deminick
e9c793cede Fixed difficult merge 2012-08-22 05:57:34 +06:00
Matt@MBP13-PC
91acf40b3b Updatedt tinyMCEImageHelper to use IFileSystem when creating scaled images 2012-08-20 11:56:16 -01:00
hartvig
e481f4e0af Adds the new resize logic to the Richtext Editor (tinymce) as well 2012-07-04 09:15:16 -02:00
Matt@MBP-PC.Home
2078873fbb Undone previous "Show Label" fix and applied at the database layer (Un-tested) 2012-07-03 18:04:56 -01:00
Matt@MBP-PC.Home
e3e4254de6 Set TinyMCE data type to default to showing the label 2012-07-03 14:05:08 -01:00
shannon@ShandemVaio.home
580cb340ac Cleaning up folder structure (U4-56) 2012-06-22 20:39:48 +04:00