Shannon Deminick
d2a285c120
Merge with 6.0.5
2013-04-25 19:43:03 -10:00
Shannon Deminick
6818ac4e50
Fixes merge issues, ensures that the UmbracoContext is set for the async operation since
...
it is required, previous versions didn't require it to be set. Added the WebSecurity property
to UmbracoUserControl, made ContentTypeControlNew inherit from UmbracoUserControl
2013-04-23 22:39:35 -10:00
Shannon Deminick
710c8aa6ea
Merge with 6.0.4
2013-04-23 21:52:07 -10:00
Shannon Deminick
f8652d98fe
Merge with 6.0.4
2013-04-20 04:01:22 +06:00
Shannon Deminick
60481e7e02
Fixes: #U4-2093 stylehsheet property cache refresher had wrong id assigned.
2013-04-20 00:18:45 +06:00
Shannon Deminick
12de5d6ed3
Merge with 6.0.4
2013-04-20 00:12:52 +06:00
Shannon Deminick
7f5457316a
Fixed: #U4-2129 - using new api didn't use the CompositionPropertyTypes instead of just PropertyTypes and fixed up cache invalidation for PublishedContentHelper
2013-04-19 23:47:51 +06:00
Sebastiaan Janssen
671c8715b0
Fix merge issue
2013-04-19 10:18:46 -02:00
Shannon Deminick
d6d630cb2c
Merge with 6.0.4
2013-04-19 04:40:49 +06:00
Shannon Deminick
988940095c
Merge with 6.0.4
2013-04-18 23:03:52 +06:00
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
a721f06ac8
Merge with 6.0.4
2013-04-18 21:22:32 +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
9137ce7cf4
Merge with 6.0.4
2013-04-17 01:57:50 +06:00
Morten Christensen
9621403f79
Fixes U4-2053
2013-04-16 17:19:46 -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
1e7e670df3
Fixes #U4-2104 - namespace issue with UmbracoApiControllers
2013-04-15 21:44:26 +06:00
Sebastiaan Janssen
a06951afbd
Fix MemberAuthorizeAttribute for UmbracoApiControllers
2013-04-15 12:18:40 -02:00
Stephan
5154bcd2e9
Web.Routing - template setter on PublishedContentRequest
2013-04-11 11:55:32 -02:00
Stephan
e3af8b4e5f
Web.Routing - public, though readonly, UmbracoContext.PublishedContentRequest
2013-04-11 11:44:15 -02:00
Sebastiaan Janssen
df26090d63
Fix merge issue
2013-04-11 07:23:13 -02:00
Stephan
ef493ef9af
fix merge + public
2013-04-10 14:02:16 -02:00
Stephan
76a12f3f33
merge with 6.1.0
2013-04-10 13:56:39 -02:00
Stephan
344a4cc485
merge with 6.1.0
2013-04-10 12:51:49 -02:00
Stephan
106d733d08
Web.PublishedCache - support XPathExpression
2013-04-10 12:49:45 -02:00
Shannon Deminick
0c3b7c27a7
fix merge issues
2013-04-10 04:24:42 +06:00
Shannon Deminick
f2293e01fa
Merge with 6.0.4
2013-04-10 04:15:26 +06:00
Shannon Deminick
1b086e2267
fixes merge issue
2013-04-10 04:04:33 +06:00
Shannon Deminick
1f86d8c562
fixes merge issues
2013-04-10 03:56:10 +06:00
Shannon Deminick
25b9262cf1
Merge with 4.11.7
2013-04-10 03:51:53 +06:00
Shannon Deminick
1012a4814d
updates #U4-2070 for tiny mce plugins
2013-04-10 03:22:11 +06:00
Shannon Deminick
bae41cde14
updates #U4-2070 for skin module files in live editing
2013-04-10 03:16:26 +06:00
Shannon Deminick
b3260f05c0
updates #U4-2070 for templateskinning.aspx
2013-04-10 03:05:57 +06:00
Shannon Deminick
e33a79ac65
updates #U4-2070 for insertMasterpageContent.aspx
2013-04-10 03:02:10 +06:00
Shannon Deminick
c4dbabf654
updates #U4-2070 for translation/xml.aspx and translation/preview.aspx
2013-04-10 02:59:47 +06:00
Shannon Deminick
423643d66c
updates #U4-2070 for tinymce3/insertmacro.aspx
2013-04-10 02:46:11 +06:00
Shannon Deminick
4ccb655f73
updates #U4-2070 for members/search.aspx
2013-04-10 02:43:03 +06:00
Shannon Deminick
c8330d60f9
updates #U4-2070 for sendToTranslation.aspx
2013-04-10 02:41:22 +06:00
Shannon Deminick
a9aa3a04b5
updates #U4-2070 for search.aspx
2013-04-10 02:39:32 +06:00
Shannon Deminick
0bffa8e3f4
updates #U4-2070 for preview.aspx
2013-04-10 02:35:31 +06:00
Shannon Deminick
436322f58c
updates #U4-2070 for directoryBrowser.aspx
2013-04-10 02:34:44 +06:00
Shannon Deminick
e90c46dd78
updates #U4-2070 for canvas.aspx
2013-04-10 02:33:08 +06:00
Shannon Deminick
deda2534f8
updates #U4-2070 for SendPublish.aspx
2013-04-10 02:30:53 +06:00
Shannon Deminick
8112c13857
updates #U4-2070 for insertMacro.aspx
2013-04-10 02:28:50 +06:00
