Commit Graph

5063 Commits

Author SHA1 Message Date
Sebastiaan Janssen
e4e0bcf642 Correct spelling error 2013-04-16 04:27:03 -02: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
Stephan
43d6c9a46d Core.Strings - bugfix DefaultShortStringHelper 2013-04-12 11:32:37 -02:00
Stephan
0b3eaf9c77 Core.Strings - refactor DefaultShortStringHelper for better backward compat. 2013-04-12 05:33:39 -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
Morten Christensen
3e8c1a426c Merge 2013-04-12 03:50:36 -02:00
Shannon Deminick
2642d74450 adds some logging and fixes sequence of events for distributed cache sending 2013-04-12 04:06:24 +06:00
Shannon Deminick
761b749f37 Merge with 6.0.4 2013-04-12 03:08:11 +06:00
Shannon Deminick
22fb7e1706 Merge 2013-04-12 03:07:53 +06:00
Shannon Deminick
4ef9dbb9b4 Merge 2013-04-12 03:07:30 +06:00
Shannon Deminick
f716ba380c Merge with 6.0.4 2013-04-12 03:02:40 +06:00
Shannon Deminick
12b1168de9 Fixes merge issues 2013-04-12 02:59:03 +06:00
Shannon Deminick
01290f8174 Merge with 4.11.7 2013-04-12 02:14:59 +06:00
Shannon Deminick
26a7bf8187 Fixes: #U4-2087 2013-04-12 02:11:01 +06:00
Morten Christensen
d7081dbc6b Implementing new RelationService.
Making EntityService public as it will be used within the RelationService.
2013-04-11 17:12:14 -02:00
Sebastiaan Janssen
439445aae4 Merge with 6.0.4 2013-04-11 16:39:28 -02:00
Sebastiaan Janssen
ba1d0fa193 Improve code for previous fix so we don't need the try/catch any more. 2013-04-11 16:36:26 -02:00
Shannon Deminick
0d79eaf3c5 Merge with 6.0.4 2013-04-12 00:32:19 +06:00
Shannon Deminick
e747438a4b Merge 2013-04-12 00:31:28 +06:00
Shannon Deminick
14f71c9059 Fixes #U4-2058 2013-04-12 00:30:45 +06:00
Sebastiaan Janssen
97355bde6f Fixes U4-2091 Inserting image in RTE with mediatype "File" causes YSOD 2013-04-11 13:15:08 -02:00
Sebastiaan Janssen
ed35f234de Fixes U4-2100 Media Doesn't Overwrite in 6.0.3 2013-04-11 12:27:11 -02:00
Sebastiaan Janssen
1d89702c2c Merge with 6.0.4 2013-04-11 10:21:37 -02:00
Sebastiaan Janssen
c874fa6507 Fixes U4-2097 Package import causes template tree to break 2013-04-11 10:20:17 -02:00
Sebastiaan Janssen
df26090d63 Fix merge issue 2013-04-11 07:23:13 -02:00
Sebastiaan Janssen
3050258fdc Merge with 6.0.4 2013-04-11 07:20:00 -02:00
Sebastiaan Janssen
ba387598ed Merge with 4.11.7 2013-04-11 07:17:23 -02:00
Sebastiaan Janssen
3ff1b01e46 Add DotSettings file for custom code inspections. In this case: Replace
!someBool with an explicit false check (someBool == false) for readability.
2013-04-11 07:15:06 -02:00
Shannon Deminick
36e803713c Fixed up some code in UmbracoEnsuredPage and moveOrCopy 2013-04-11 02:15:48 +06:00
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
84e990c239 Core.Configuration - fix setting that accidentally became public 2013-04-10 14:19:26 -02:00
Stephan
911a1cf80b merge 6.1.0-public into 6.1.0 2013-04-10 14:03:47 -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
Sebastiaan Janssen
a010448ad1 Merge with 6.0.4 2013-04-10 11:55:36 -02:00
Sebastiaan Janssen
1586f1679a Merge with 4.11.7 2013-04-10 11:54:24 -02:00
Sebastiaan Janssen
809badd1cf Update version to 4.11.7 2013-04-10 08:54:31 -02:00
Sebastiaan Janssen
da92ece774 Update version to 4.11.7 2013-04-10 07:57:56 -02:00
Sebastiaan Janssen
a531afb819 Don't need IronPython license any more either. 2013-04-10 07:46:05 -02:00
Sebastiaan Janssen
111df761aa Merge with 6.0.4 2013-04-10 07:43:10 -02:00
Sebastiaan Janssen
1d6009e3c7 Merge with 4.11.7 2013-04-10 07:42:21 -02:00
Sebastiaan Janssen
8dfeb1e616 Cleanup solution and folders, removes Linq2Umbraco and IronPython engine from
the project as we don't ship with them any more. Updated readme and docs.
2013-04-10 07:30:14 -02:00
Shannon Deminick
5f9c7bb49c changed DefaultServerMessenger to expose login 2013-04-10 09:41:53 +06: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