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

5108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon Deminick
a895a2a20a Fixes merge issues, ensures that the tree node is reloaded when publishing. 2013-04-18 22:01:28 +06:00
Shannon Deminick
a5e33e1e02 Merge with 6.0.4 2013-04-18 21:45:04 +06:00
Shannon Deminick
e5e4e7b685 Fixes another merge issue and improves performance slightly for sorting so that we are not double saving the entity if it is published already. 2013-04-18 21:44:38 +06:00
Shannon Deminick
a721f06ac8 Merge with 6.0.4 2013-04-18 21:22:32 +06:00
Shannon Deminick
88795b86fd Updated merge issue, and removed the call to refreshXmlSortOrder since we are already republishing which already writes the updated xml 2013-04-18 21:16:00 +06:00
Shannon Deminick
378a544c1a Merge with 4.11.7 2013-04-18 20:59:42 +06:00
Shannon Deminick
a159b50c05 Fixed a couple threading issues. Improved the performance of the nodeSorter but this should be better improved in 6.x 2013-04-18 20:52:49 +06:00
Shannon Deminick
3891e46549 Fixed a couple threading issues. Improved the performance of the nodeSorter but this should be better improved in 6.x 2013-04-18 20:52:30 +06:00
Shannon Deminick
e7bcc642a9 fix build error on build server 2013-04-18 19:50:01 +06:00
Shannon Deminick
4983990d39 Big optimization for content.SortNodes - 92% performance increase for this method which is a big 
contributor to CPU time during publishing.
 2013-04-18 05:43:05 +06:00
Shannon Deminick
3b1bfe04f2 updates method name 2013-04-18 01:15:25 +06:00
Shannon Deminick
979fe46e9b Updated CDF to 1.6.0.0 2013-04-18 00:55:40 +06:00
Shannon Deminick
0107a10145 Manually merge in changes for previous commits due to the codebase differences in 6.1 2013-04-18 00:06:42 +06:00
Shannon Deminick
a38f0af49b Merge with 6.0.4 2013-04-17 23:47:33 +06:00
Shannon Deminick
e9a496df4f Merge with 4.11.7 2013-04-17 23:31:52 +06:00
Shannon Deminick
2f6dada481 Fixes issue with ctor not setting default property 2013-04-17 23:20:20 +06:00
Shannon Deminick
580123cb87 fixed merge issues 2013-04-17 23:03:51 +06:00
Shannon Deminick
de0e47d7ef Merge with 4.11.7 2013-04-17 22:50:31 +06:00
Shannon Deminick
ff5dc324fe Fixes: #U4-227 - ensures data is not persisted to the db for members/media if validation fails. 
Fixes up (enables) validation summary for members too.
 2013-04-17 22:41:43 +06:00
Shannon Deminick
096c5ad69f Fixes: #U4-485, changes name field from saving to the db if it is empty. cleans up some code. 2013-04-17 22:05:10 +06:00
Morten Christensen
83d1e9c76f Merge 2013-04-17 11:25:53 -02:00
Sebastiaan Janssen
eba7582a97 Eh, yeah, maybe I should start with making a copy of the element first.. d'oh! 2013-04-17 11:16:15 -02:00
Sebastiaan Janssen
0cf2a1fc2a Possible fix for U4-2097 Package import causes template tree to break - modified 
closure problem
 2013-04-17 10:57:24 -02:00
Sebastiaan Janssen
77ee87178e Merge 2013-04-17 07:04:04 -02:00
Sebastiaan Janssen
a6997a5cb7 Revert U4-1922 to resume expected sorting behavior. 2013-04-17 07:03:18 -02:00
Sebastiaan Janssen
b40619634d Fix bad merge 2013-04-17 06:36:40 -02:00
Morten Christensen
fc84a21f06 Adding a few methods to relate two entities both based on the IUmbracoEntity. 2013-04-17 06:26:59 -02:00
Shannon Deminick
9137ce7cf4 Merge with 6.0.4 2013-04-17 01:57:50 +06:00
Shannon Deminick
ff3fc5d825 Merge with 4.11.7 2013-04-17 01:56:20 +06:00
Morten Christensen
9621403f79 Fixes U4-2053 2013-04-16 17:19:46 -02:00
Stephan
3b9bf7b0f9 U4-2117 - fix Ancestor- vs AncestorsOrSelf inconsistencies 2013-04-16 12:58:03 -02:00
Stephan
3882e1984d U4-2117 - fix Ancestor- vs AncestorsOrSelf inconsistencies 2013-04-16 12:29:58 -02:00
Stephan
2245c88396 U4-2117 - fix Ancestor- vs AncestorsOrSelf inconsistencies 2013-04-16 12:29:58 -02:00
Sebastiaan Janssen
2e39c55d56 Merge 2013-04-16 04:27:44 -02:00
Sebastiaan Janssen
e4e0bcf642 Correct spelling error 2013-04-16 04:27:03 -02:00
Shannon Deminick
7537e4c6d6 updated DefaultServerMessenger with more ctor options for testing 2013-04-16 04:05:31 +06:00
Shannon Deminick
c410b6dc20 Changed UmbracoSettings back to internal, it should not be exposed atm 2013-04-16 02:49:14 +06:00
Shannon Deminick
1e7e670df3 Fixes #U4-2104 - namespace issue with UmbracoApiControllers 2013-04-15 21:44:26 +06:00
Shannon Deminick
da53ffe9f2 Merge 2013-04-15 21:36:35 +06:00
Shannon Deminick
47f6401fcd updates unit test to ensure UmbracoContext.Current is nulled, updates dispose on application context to 
not dispose the database if it is not configured.
 2013-04-15 21:36:24 +06:00
Sebastiaan Janssen
33190ea5e1 Merge 2013-04-15 12:19:11 -02:00
Sebastiaan Janssen
a06951afbd Fix MemberAuthorizeAttribute for UmbracoApiControllers 2013-04-15 12:18:40 -02:00
Sebastiaan Janssen
b32ea68fd0 Merge with 4.11.7 2013-04-15 07:36:58 -02:00
Sebastiaan Janssen
eb2db791b8 Additional fix for U4-2105 Saving a document will make it look like it is unpublished 2013-04-15 07:33:26 -02:00
Sebastiaan Janssen
158f4d0614 Merge 2013-04-15 07:32:00 -02:00
Sebastiaan Janssen
7a38970cf4 U4-2109 Regex text-field in DocTypes > (a type) > Properties (a property) > 
Validation + Description lack Trimming
 2013-04-15 07:31:24 -02:00
Stephan
43d6c9a46d Core.Strings - bugfix DefaultShortStringHelper 2013-04-12 11:32:37 -02:00
Sebastiaan Janssen
7f6d8b6bdd Fixes U4-2105 Saving a document will make it look like it is unpublished 2013-04-12 06:49:06 -02:00
Stephan
0b3eaf9c77 Core.Strings - refactor DefaultShortStringHelper for better backward compat. 2013-04-12 05:33:39 -02:00
Shannon Deminick
0fe8ff57a1 changes a method to be protected instead of private 2013-04-12 05:04:20 +06:00