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

9265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perploug
f780c21ef0 Removed crops from umbracoSettings.cfg 2014-02-19 00:19:18 +01:00
perploug
84e7396729 Ensure that umbracoFile doesnt try to process json as a filepath 2014-02-19 00:19:17 +01:00
perploug
7ed11c04c5 Updates yepnope cache in jsinit.cs to append correct rnd value 2014-02-19 00:19:16 +01:00
perploug
81305173ca Changes imagecropper to store config in its property data 2014-02-19 00:19:15 +01:00
perploug
6637ceaf41 Add support for looking up 3rd party editor file paths 
Adds a file resolver on the mediaHelper, property editors can then
register a resolver to return file paths from whatever format
 2014-02-19 00:19:13 +01:00
perploug
82d5f7b72b Adjusted assetsService to deal with weird yepnope behaivior 2014-02-19 00:19:12 +01:00
perploug
e69dea26a5 Adds extra null checking when looking up active tree 2014-02-19 00:19:11 +01:00
Shannon
20c2574f94 Merge remote-tracking branch 'origin/7.0.4' into 7.1.0 
Conflicts:
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
	src/umbraco.providers/UsersMembershipProvider.cs
 2014-02-18 11:11:57 +11:00
Shannon
ab4c58b3a3 restores BuildBelle 2014-02-18 11:11:06 +11:00
Shannon
cb63642ce9 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-02-18 10:48:51 +11:00
perploug
3fb756939e ImageProcessor config files 2014-02-17 16:17:18 +01:00
perploug
ec14a16aec ImageCropper Razor models + helpers 2014-02-17 16:17:17 +01:00
perploug
6944f25c9f Fixes Assets.Service callback not firering 2014-02-17 16:17:16 +01:00
perploug
45c7699a33 Footer breadcrumb navigation 2014-02-17 16:17:09 +01:00
perploug
2bd2f12831 ImageCropper Upload enabled 
The cropper can now fully replace the upload datatype
 2014-02-17 16:17:02 +01:00
Stephan
a4b1b31a24 U4-4241 - UrlAbsolute() returns relative urls 2014-02-17 10:49:26 +01:00
Shannon
13f76f7922 Updates version 
Signed-off-by: Shannon <sdeminick@gmail.com>
 2014-02-17 20:41:53 +11:00
Shannon
d12a9e046f Fixes: U4-4172 Change password in users section not working (u7.0.3) 
Signed-off-by: Shannon <sdeminick@gmail.com>
 2014-02-17 20:41:30 +11:00
Shannon
b73c39b4e9 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
	src/Umbraco.Core/Services/UserService.cs
	src/Umbraco.Tests/Services/PerformanceTests.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
 2014-02-17 17:48:16 +11:00
Shannon
feefb052fd Updates the BulkInsertRecords method to optionally close the trans - shouldn't by default. Updates how permissions are handled in the new services and exposes another method, ensures it's all wrapped in trans and ensures that cache is cleared properly. Fixes: U4-4213 "Replace child node permissions" does not work if all permissions cleared 2014-02-17 17:45:59 +11:00
Shannon
87f93be6ba updates version 2014-02-17 16:06:46 +11:00
Shannon
7e7c4b52b6 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/PluginManager.cs
 2014-02-17 15:59:43 +11:00
Shannon
4d2d9156ba updates more plugin manager defs 2014-02-17 15:58:57 +11:00
Shannon
a1603c3cbd Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/EntityPermission.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
	src/Umbraco.Core/PluginManager.cs
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web/Search/ExamineEvents.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
 2014-02-17 15:56:48 +11:00
Shannon
82ba1a24a3 Ensures we perform null checks in both GetAll and GetByQuery as we never want to include a null item in the resultant collection - which could happen depending on what the sub class repository is doing. 
Fixes: U4-3145 Cache file periodically becomes corrupted: "Oops: this document is published but is not in the cache (internal error)"
 2014-02-17 15:45:36 +11:00
Shannon
357db9d0b6 completes: U4-3282 Expose permission assignment methods at the service layer 2014-02-17 15:33:17 +11:00
Shannon
61766287bc Cleans up some more of the old 'object' User Id references. 2014-02-17 15:26:38 +11:00
Shannon
ffbf8b2fd6 completes: U4-4103 Publicize PluginManager for devs to use to create their own plugins 2014-02-17 15:08:27 +11:00
Shannon
e8c25283b0 Fixes: U4-2876 Ensure runtime cache is cleared with ICacheRefreshers when macro's change since they use the RuntimeCacheProvider 2014-02-17 15:03:49 +11:00
Shannon
f7a703195c Fixes: U4-4215 Tree.config registeres tree inconsistently 2014-02-17 14:56:12 +11:00
Shannon
848e8b5722 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-17 14:15:54 +11:00
Shannon
4d316c9671 fixing some casting 2014-02-17 14:15:40 +11:00
Shannon
509be9b431 Updates the underlying UmbracoServiceMembershipProvider to deal with 'object' for provider key, this then lets us deal with either guid or int for the new membership provider, just like the old one does. 2014-02-17 14:14:17 +11:00
Shannon
8154382fb1 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
 2014-02-17 13:17:19 +11:00
Shannon
10ef5eb7bc adds new interface for members' membership providers to implement so we know what aliases to store data against. 2014-02-17 13:16:28 +11:00
Shannon
f4c1c4578f adds some null checking 2014-02-17 12:56:37 +11:00
Shannon
6f15949af7 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-17 12:24:37 +11:00
Shannon
2849ecadb7 fix legacy member wrapping new api and mixing email/login name 2014-02-17 12:24:11 +11:00
Shannon
778c698ef7 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-17 12:10:12 +11:00
Shannon
697f93c3ce removes null check for LoginName, since it gets set to the name passed in if it is empty 2014-02-17 12:09:27 +11:00
Shannon
e6c2f0ad70 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-17 11:50:39 +11:00
Shannon
13976559a8 Created a EntityNotFoundException to use when we are expecting an umbraco entity found. Updates some code to use this exception. 2014-02-17 11:50:13 +11:00
Shannon
18121e8726 Enxures user start node's are -1 by default when creating the model. 2014-02-17 11:48:32 +11:00
Shannon
8b6583b554 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-17 11:23:24 +11:00
Shannon
234d4cf427 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 
Conflicts:
	src/Umbraco.Core/Models/Template.cs
 2014-02-17 11:23:02 +11:00
Shannon
81cdc71145 Ensures new user objects are approved by default. 2014-02-17 11:17:15 +11:00
Sebastiaan Janssen
f822400036 Fix broken build 2014-02-15 14:24:40 +01:00
Shannon
2aae108cb4 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web/Security/WebSecurity.cs
 2014-02-13 17:21:30 +11:00
Shannon
4069fc8d1f fixes issue with legacy user.Password property and fixes comparison of sections 2014-02-13 17:19:28 +11:00
Shannon
643f05d949 fixes some more merge issues 2014-02-13 16:56:23 +11:00