Commit Graph

5379 Commits

Author SHA1 Message Date
Shannon Deminick
7d7ca4530b Getting server side integration working from ported over Belle POC including temporary custom property editors.
Many files committed will be temporary and will be removed once development between the Belle UI project and this project are merged
and working.
2013-05-27 18:21:07 -10:00
Shannon Deminick
8ab85133bd Merge with 6.1.0 2013-05-27 17:17:52 -10:00
Shannon Deminick
f6155d8e49 Fixes: #U4-2243 - reverts code to use the legacy API to create a template until the new template service is updated to work as it did. 2013-05-27 17:13:12 -10:00
Sebastiaan Janssen
c1cd609325 Merge with 6.0.6 2013-05-27 10:23:03 -02:00
Sebastiaan Janssen
b916360771 Merge with 4.11.9 2013-05-27 10:22:20 -02:00
Sebastiaan Janssen
db4b93dbc3 Update test because of new added restextension (EmbedMediaService) 2013-05-27 10:21:14 -02:00
Sebastiaan Janssen
fa8934f89a Merge with 6.0.6 2013-05-27 10:09:00 -02:00
Sebastiaan Janssen
c6940096d3 Merge 2013-05-27 10:08:36 -02:00
Sebastiaan Janssen
40868ac361 Merge 2013-05-27 10:02:01 -02:00
Sebastiaan Janssen
f399a9f52b Merge with 4.11.9 2013-05-27 10:00:28 -02:00
Sebastiaan Janssen
562851b93e Possible fix for U4-2251 TreeDataService throws JSON JavaScriptSerializer. The
length of the string exceeds the value set on the maxJsonLength property
2013-05-27 09:59:02 -02:00
Shannon Deminick
cdbd1b504f upgraded other projs to 4.5, added page to render for back office for, now to get requirejs wired up properly as its not returning the correct
paths.
2013-05-27 01:23:49 -10:00
Morten Christensen
634e4a6949 Merge with 6.0.6 2013-05-27 08:47:14 -02:00
Morten Christensen
e61b567ee1 Fixes #U4-2270 and #U4-2269 2013-05-27 08:45:07 -02:00
Sebastiaan Janssen
7ccae64dd1 Fix merge issue 2013-05-27 08:19:20 -02:00
Sebastiaan Janssen
aef44065c5 Merge with 6.0.6 2013-05-27 08:17:49 -02:00
Sebastiaan Janssen
4ce22b836e Merge with 4.11.9 2013-05-27 08:16:18 -02:00
Sebastiaan Janssen
2b8544b4c7 Merge 2013-05-27 07:40:59 -02:00
Sebastiaan Janssen
6afa6a277f Fixes U4-2263 unable to create or save stylesheet content 2013-05-27 07:40:29 -02:00
Sebastiaan Janssen
f5bf05a6f5 Move embed media service from webservices dll into it's own /base class 2013-05-27 07:19:42 -02:00
Morten Christensen
469db82f1d Internal creation of backoffice users and unit test to verify 2013-05-27 06:50:14 -02:00
Sebastiaan Janssen
e50569597b Minor update to legacy ajax calls 2013-05-27 06:10:04 -02:00
Sebastiaan Janssen
071f3dcc01 Fix javascript error with the speechbubble 2013-05-27 06:05:13 -02:00
Shannon Deminick
faae0b85cb importing more stuff from Belle proj 2013-05-26 19:54:50 -10:00
Shannon Deminick
8b841e19eb Upgrades required projects to .Net 4.5 2013-05-26 13:33:43 -10:00
Morten Christensen
e0bc99af9c Merge 2013-05-24 08:14:07 -02:00
Morten Christensen
232581664b Moving internal membership provider classes.
Adding missing alias to AllowedContentTypes on ContentType.
Adding Package export test.
2013-05-24 08:13:24 -02:00
Shannon Deminick
0f5d61bae8 Started importing classes and functionality from the Belle project so we can start wiring up data. 2013-05-23 22:15:52 -10:00
Shannon Deminick
ac93406194 Creating v7 branch 2013-05-23 21:32:59 -10:00
Shannon Deminick
b15e147d6b Removed internal classes relating to property editors that are not used and were initially ported from v5 but we'll be
creating new/different ones for v7.
2013-05-23 21:32:26 -10:00
Morten Christensen
c7a4c782e3 Internal work around the creation of users through the new api. 2013-05-23 13:25:14 -02:00
Morten Christensen
780908e24f Fixing merge issues and updating nodeSorter to use EntityService and new Sort method for improved performance.
Fixes #U4-1750
2013-05-23 11:34:06 -02:00
Morten Christensen
3ac7e237c4 Merge with 6.0.6 2013-05-23 10:38:09 -02:00
Morten Christensen
6943a454f3 Implementing Sort-method for the Content/MediaService 2013-05-23 10:29:44 -02:00
Morten Christensen
e870db3c29 Fixing MacroTests that had a dependency on the Profiler, which wasn't setup in the fixture. 2013-05-22 11:24:46 -02:00
Morten Christensen
41b17160f7 Excluding a few new classes, which won't make it into 6.1.0. 2013-05-22 11:08:27 -02:00
Morten Christensen
b19621c07b Improving tree performance for Content and Media trees using the new EntityService and the thin IUmbracoEntity object.
Updating a few internal overloads as well as adding new ones to ensure backwards compatibility for events used by the tree.
Fixing issue with the Published/Unpublished/Saved/Pending Changes states shown in the content tree.
2013-05-22 11:06:21 -02:00
Morten Christensen
0ff979e814 Adding missing method for retreiving parent or child relations.
Implements #U4-2237
2013-05-22 07:53:16 -02:00
Morten Christensen
f26e39f5ce Adding a new extensibility in relation to #U4-2244 which allows consumers of the CoreBootManager to explicitly set the path to the root of an umbraco site/solution.
A bit of cleanup in the IOHelper class.
2013-05-22 07:48:42 -02:00
Morten Christensen
9a6030a3eb Fixes #U4-2244 2013-05-22 07:12:58 -02:00
Morten Christensen
84ef216d57 Merge 2013-05-17 05:51:49 -02:00
Morten Christensen
ecfe51134d Updating the internal standalone context, and adding one that is limited to the core assembly to limit dependencies. 2013-05-17 05:51:22 -02:00
Shannon Deminick
c8414116ad Merge with 6.0.6 2013-05-14 14:21:15 -10:00
Shannon Deminick
532f407260 Merge with 4.11.9 2013-05-14 14:20:52 -10:00
Shannon Deminick
834d04f8ed Fixes: #U4-1469, #U4-1156 2013-05-14 14:18:41 -10:00
Shannon Deminick
2aa902beaf Fixed up unit test 2013-05-14 13:50:16 -10:00
Shannon Deminick
2f16e6662d updates disposable timer to ensure it also outputs to HttpTrace if there is one. 2013-05-14 13:39:55 -10:00
Shannon Deminick
0c4897d7c1 Changed the trace logger for PublishedContentRequestEngine to be correct. 2013-05-13 22:32:02 -10:00
Shannon Deminick
43dc14fa93 Changed over all direct calls to the profiler to use DisposableTimer.DebugDuration 2013-05-13 22:17:55 -10:00
Shannon Deminick
e209aa3c2a Streamlined the profiling in the macro class. 2013-05-13 22:13:52 -10:00