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

10570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
e2f4cfaf82 U4-4931 - fixing & refactoring 
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
 2014-07-10 10:35:12 +02:00
Stephan
8729156fbf U4-4931 - lock contention & potential application lockdown 
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/umbraco.cms/Actions/Action.cs
 2014-07-10 10:34:17 +02:00
Shannon
60d6ae44b5 Fixes: U4-5208 RenderActionInvoker needs to be able to run async so needs to inherit from AsyncControllerActionInvoker 2014-07-10 17:28:33 +10:00
Shannon
b3035d160c adds another test 2014-07-10 13:48:32 +10:00
Shannon
f27f458a5d Adds another test 2014-07-10 13:46:31 +10:00
Shannon
3f09453345 Fixes: U4-5198 Tags still appearing from items tagged in recycle bin 2014-07-10 13:40:22 +10:00
Shannon
4857107b5e Fixes: U4-4852 ContentService can add new permissions but not remove them 2014-07-10 12:24:36 +10:00
Shannon
080bf7293d replaces the tuple collection for bulk permission assignment to use a new model: EntityPermissionSet 2014-07-10 12:11:47 +10:00
Shannon
b3288f0c91 fixes merge issue 2014-07-10 12:11:10 +10:00
Shannon
b254f81f4a Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 2014-07-10 11:54:05 +10:00
Shannon
17b0547cfc Merge commit '874f464a2b51000920e2323f93bea116546e9b88' into 7.1.5 
Conflicts:
	src/Umbraco.Core/IO/FileSystemExtensions.cs
	src/Umbraco.Core/IO/UmbracoMediaFile.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
 2014-07-10 11:53:45 +10:00
Shannon
86c2a6e8a9 updates physical file system, now that files are being disposed of properly we don't need to delete first 2014-07-10 11:51:48 +10:00
Shannon
874f464a2b Fixes: U4-5190 Overwrite Media File in 6.2.1 - process cannot access along with a bunch of other undisposed disposables :/ 2014-07-10 11:45:57 +10:00
Shannon
93151a43ac Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
	src/Umbraco.Web/Security/MembershipHelper.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
 2014-07-10 11:14:20 +10:00
Shannon
b3c41e051f Fixes: U4-5199 Appending certain query strings to URLs cause InvalidOperationException (The UmbracoContext.Current is null) 2014-07-10 11:10:49 +10:00
Shannon
a88637910f updates content xml bits so if it's called outside a web req it still executes. 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/content.cs
 2014-07-10 10:45:26 +10:00
Shannon
1af7649a87 updates content xml bits so if it's called outside a web req it still executes. 2014-07-10 10:44:40 +10:00
Shannon
431e93000e Fixes: U4-5157 Membership.GetUser() causes 13 SQL queries, including duplicates 2014-07-08 19:04:38 +10:00
Shannon
f83bbdbf90 Fixes: U4-5157 Membership.GetUser() causes 13 SQL queries, including duplicates 2014-07-08 18:54:36 +10:00
Shannon
5a810b584e Fixing: U4-5157 Membership.GetUser() causes 13 SQL queries, including duplicates 2014-07-08 18:07:59 +10:00
Shannon
bcae3afa45 fixes null check on tag extractor 2014-07-07 16:21:53 +10:00
Shannon
3aff474648 Fixes: #U4-4685 Default sorting of listview items 2014-07-07 16:21:12 +10:00
Shannon
1a821b4073 super quick performance win in the case where people don't pass in distinct values 2014-07-01 17:41:22 +10:00
Shannon
efda233fcf super quick performance win in the case where people don't pass in distinct values 2014-07-01 17:40:41 +10:00
Shannon
ed2e409707 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web/Security/MembershipHelper.cs
 2014-07-01 12:54:48 +10:00
Shannon
8645e0b193 Fixes: U4-5140 Tags are not respected with bulk publish operations - just need to ensure all tests are passing and run some local tests 2014-07-01 12:53:07 +10:00
Shannon
a89b9e9da6 ignores log4net tests 2014-07-01 11:16:57 +10:00
Shannon
8917701fa3 ignores failing test - need stephane to look 2014-07-01 11:03:47 +10:00
Shannon
68b17bff08 Ensures no membership user writing when checking public access 2014-07-01 10:52:29 +10:00
Shannon
9b2b961f83 Ensures no membership user writing when checking public access 2014-07-01 10:51:56 +10:00
Shannon
7a12060c37 Potentially fixes U4-5069 Deadlock occurring in MemberService.GetByUsername 
Conflicts:
	src/Umbraco.Web/Security/MembershipHelper.cs
 2014-07-01 10:46:52 +10:00
Shannon
f3c7533796 Potentially fixes U4-5069 Deadlock occurring in MemberService.GetByUsername 2014-07-01 10:43:44 +10:00
Shannon
59116fc7fa un-does the tag export/import, instead need to look at the internal of a simple publish (without save) to see if tags get written or not. 2014-06-30 17:05:34 +10:00
Shannon
a66670263f fixes null check 2014-06-30 17:04:59 +10:00
Shannon
1e1d49f305 fixes U4-5140 Package installation for content does not respect tags, however need to check with Morten if it's required because if we never actually publish content on package install then this wouldn't really matter. But surely we must publish on package install for some thing because starter kits are published... hrm. 2014-06-30 16:43:51 +10:00
Shannon
1be2706c30 fix merge 2014-06-30 15:09:41 +10:00
Shannon
eaf2956524 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
 2014-06-30 14:26:33 +10:00
Shannon
525280d466 fixed some tests 2014-06-30 14:09:36 +10:00
Shannon
496beca8f2 This Can_Find_Targetted_Migrations test needed a valid database to pass. This update ensures that the database is created with the old version 4.8 db schema. 2014-06-30 14:02:43 +10:00
Stephan
45e6127d00 U4-4866 - fix the build 2014-06-28 16:26:27 +02:00
Sebastiaan Janssen
5bee398d09 #U4-3838 fixed Due in version 7.1.5 
Fixes ContentService Copy uses IOHelper.MapPath but should use fs.GetFullPath and a few other instances where IOHelper was used
 2014-06-27 17:22:51 +02:00
Sebastiaan Janssen
c53d812742 #U4-3154 Fixed Deleting single media item in recycle bin does not use the FileSystemProvider 2014-06-27 16:26:22 +02:00
Sebastiaan Janssen
966a29954c #U4-5010 fixed 
Package editing view missing in distribution
 2014-06-27 16:25:57 +02:00
Morten Christensen
9f28aea10d This Can_Find_Targetted_Migrations test needed a valid database to pass. This update ensures that the database is created with the old version 4.8 db schema. 2014-06-27 13:23:54 +02:00
Morten Christensen
097014454f Fixing issue in MacroRepository which was causing a test to fail. 
Changing the alias of a macro property didn't alias work, so added a fallback to the Id of the property in the cases where the Alias wouldn't work.
 2014-06-27 12:42:15 +02:00
Morten Christensen
48143bc0c3 Minor updates to the Package installation and extraction as part of PR #417 2014-06-27 12:37:56 +02:00
Morten Christensen
75c26e4d92 Merge pull request #417 from netmester/package_installer_service 
Package installer service
 2014-06-27 10:58:10 +02:00
Shannon
ad4135f629 does a toarray to make sure it doesn't reiterate 2014-06-27 14:04:35 +10:00
Shannon
8e7ed865f0 Fixes: U4-5151 Backoffice controllers collide on name even if different namespace 2014-06-27 13:34:15 +10:00
Shannon
f627de2433 tweaks orange 2014-06-26 17:38:24 +10:00