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

8325 Commits

Author SHA1 Message Date
leekelleher
0370a1bcf2 PublishedContentModelFactory: Changes the private 'constructors' dictionary to be case-insensitive. 2014-07-21 15:32:16 +01:00
Shannon
6e78a9f98f fix merge 2014-07-16 14:14:02 +10:00
Shannon
92c19ba76c Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Core/IO/UmbracoMediaFile.cs
 2014-07-16 14:13:05 +10:00
Shannon
7848a3095d Fixes: U4-5207 User Type with a space in the name breaks User Content 2014-07-16 14:12:04 +10:00
Shannon
1a75e7beb1 Fixes: U4-5207 User Type with a space in the name breaks User Content 2014-07-16 14:10:24 +10:00
Shannon
388eea95e5 fixes a single vs first check with render route handler when there might be duplicate routes assigned to a controller, fixes short/int parse 2014-07-16 13:46:15 +10:00
Shannon
fdf1218a9e fixes another short/int parse 2014-07-16 13:43:08 +10:00
Shannon
1a1aba92ef Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-07-16 13:41:11 +10:00
Shannon
39ee22cbd6 fixes a single vs first check with render route handler when there might be duplicate routes assigned to a controller 2014-07-16 13:41:02 +10:00
Jeroen Breuer
e22282c1e8 Fix for U4-5223 2014-07-15 14:24:27 +02:00
Shannon
6167d1584a Fixes an xss vulnerability 2014-07-15 11:37:31 +10:00
Shannon
0c2d1f72b9 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-07-15 11:36:13 +10:00
Shannon
8c36dac67a Fixes an xss vulnerability 2014-07-15 11:36:03 +10:00
Stephan
d7f8b10b28 Merge pull request #424 from semmeo/7.1.5 
Update fr.xml
 2014-07-11 12:36:20 +02:00
Semmeo
7e8be5fd67 Update fr.xml 
Updated french umbraco translation from scratch, by translating en.xml. Tested and working.
 2014-07-11 12:31:20 +02:00
Shannon
6b128ea7d4 Fixes: U4-5208 RenderActionInvoker needs to be able to run async so needs to inherit from AsyncControllerActionInvoker 2014-07-10 17:29:34 +10: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
d5993a4783 Backports fix from 7 for GetDimensions call to ensure the file exists 2014-07-10 12:09:26 +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