Shannon Deminick
a3e7f644de
merges changes for UmbracoHelper from 6.0.x to deal with null objects when using Content method (dynamic)
2013-04-10 22:51:19 +06:00
Stephan
5e1115218c
Web.Standalone - import initial version
...
* * *
FOLD 003
2013-04-10 12:50:08 -02:00
Stephan
5d89ab1e2a
Web.UI - fix nasty preview bug introduced in 9a92dea49ede
2013-05-03 20:09:15 -02:00
Stephan
262aa3b8fe
Web.Routing, Web.Mvc - fix issues with content with no template
2013-05-03 20:09:14 -02:00
Shannon Deminick
294c2f4fba
Fixes: #U4-2183 - null check on UmbracoContext and fixes bad merge issue, the UserTypeCacheRefresher got removed from the proj file.
2013-05-02 14:24:27 -10:00
Shannon Deminick
eca01b845c
publicized some ObjectExtensions, added Umbraco.Belle to internals, updated the names in which plugin routes are created,
...
added HttpUrlHelper extensions for web api
2013-04-30 16:43:59 -10:00
Shannon Deminick
8e1f7170c7
Merged in TypeFinder changes from U4-1187 and wrote benchmark unit tests and other general
...
tests to confirm it is still finding types.
2013-04-29 19:48:11 -10:00
Shannon Deminick
aba4a9b07c
oops, removed test code
2013-04-28 16:15:19 -10:00
Shannon Deminick
577d77cfab
Fixes: #U4-1760 - allows a developer to set the default RenderMvcController on startup.
2013-04-28 16:09:24 -10:00
Shannon Deminick
6cffa67518
Fixes merge issues and WebSecurity with the correct encryption (from failed merge along time ago).
...
Fixes ContentType to ensure that ALL property type values get reset, not just ones assigned to a group.
Fixes logic in ContentTypeService to ensure that xml is re-generated when a property type alias is changed too.
2013-04-25 21:09:07 -10:00
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
