Commit Graph

4846 Commits

Author SHA1 Message Date
Shannon Deminick
182107286c Fixes merge issues 2013-04-02 23:08:43 +06:00
Shannon Deminick
a7e939e71f Merge with 6.0.4 2013-04-02 22:39:39 +06:00
Shannon Deminick
b9d7f0c5a5 Fixes merge issues, merge ensures that js error is fixed and that thread-safe caching is in place
in the ContentType.cs class.
2013-04-02 22:06:15 +06:00
Shannon Deminick
3d76614a78 Merge with 4.11.7 2013-04-02 21:31:21 +06:00
Stephan
83d05bd01c U4-2033 - url segment is not lower case 2013-04-02 11:34:40 -02:00
Stephan
9fb10ea004 presentation.UmbracoContext - get property values from appropriate sources 2013-04-02 09:23:53 -02:00
Stephan
c916df0d13 Core.Strings - apply 2551076f571a to 6.1.0 2013-04-02 09:19:49 -02:00
Sebastiaan Janssen
de0e6f3179 Merge 2013-04-02 08:08:31 -02:00
Sebastiaan Janssen
39edb9b7e2 Fixes U4-2032 Preview for an RTE field shows published content instead of actual
preview
2013-04-02 08:07:18 -02:00
Stephan
99a63a3cdb fix build 2013-04-01 16:35:03 -02:00
Shannon Deminick
a638488eb7 Fixes unit tests which require the ApplicationContext.Current singleton to be setup 2013-04-01 23:30:19 +06:00
Shannon Deminick
a2a539f7db Merge 2013-04-01 23:12:47 +06:00
Shannon Deminick
6768bb4793 Fixes: #U4-1874 - merges in thread-safe fixes for static object caching from 6.1 and cleans up
a bunch of the code in ContentType.cs. Back ports fixes for Languages.cs from 6.1 and cleans up code.
2013-04-01 23:12:17 +06:00
Sebastiaan Janssen
19c2841576 Fixes U4-535 Stylesheet content gets deleted if you change case 2013-04-01 14:27:20 -02:00
Sebastiaan Janssen
71aa248a4e Fixes U4-535 Stylesheet content gets deleted if you change case 2013-04-01 14:27:20 -02:00
Sebastiaan Janssen
eeaef5ac5c Merge 2013-04-01 11:51:48 -02:00
Sebastiaan Janssen
bea50f4562 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:50:27 -02:00
Sebastiaan Janssen
ff337457f8 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:31:03 -02:00
Stephan
ad52c0f033 Web.Cache - add notes to cache refreshers re. dependencies 2013-03-31 18:40:55 -02:00
Stephan
6d18d32356 Web.Routing - bugfix PublishedContentRequestEngine
no macro would run when rendering a 404 document
2013-03-31 18:40:54 -02:00
Stephan
75f0f1f4ee Web.UmbracoContext - allow for InPreviewMode override in tests 2013-03-31 18:40:54 -02:00
Stephan
425a9f6a34 Core.Xml - import framework xml tests 2013-03-31 18:40:54 -02:00
Stephan
1d5f7ae822 Core.Strings - handle config. errors in DefaultShortStringHelper 2013-03-31 18:40:54 -02:00
Morten Christensen
49b5ddf850 Refactor of fix for U4-2014 2013-03-31 18:17:01 -02:00
Morten Christensen
3f7a93e0c9 Adding test fixture for the EntityService.
Refactoring sql query used in the EntityRepository.
Correcting a few issues with the UmbracoObjectTypes extensions.
2013-03-30 09:52:37 -01:00
Shannon Deminick
b449b8762b Merge 2013-03-29 23:53:08 +06:00
Shannon Deminick
13e555f50b Fixed merge issue based on overlap with class + namespace name. 2013-03-29 23:52:40 +06:00
Shannon Deminick
48c809a797 Merge with 4.11.7 2013-03-29 23:22:18 +06:00
Shannon Deminick
55c7f72d8e Converts create.aspx to have the correct webforms file/class structure, fixed logging for userTask,
fixed issue with last regex fix for xss
2013-03-29 23:14:42 +06:00
Sebastiaan Janssen
8612113fc0 Merge 2013-03-29 15:02:43 -01:00
Sebastiaan Janssen
69b0c7cf09 Fixes: U4-2024 Umbraco 6.0.3 : Error while importing Document Type 2013-03-29 15:01:04 -01:00
Shannon Deminick
72ad9f51c1 Merge with 6.0.4 2013-03-29 21:41:08 +06:00
Shannon Deminick
37a97a2e7c Merge with 4.11.7 2013-03-29 21:34:56 +06:00
Shannon Deminick
5f4eaef4a2 Fixes: #U4-2022 2013-03-29 21:31:27 +06:00
Sebastiaan Janssen
44f5c3a34f Fixes U4-2019 Create new Document Type dialog displays poorly in Chrome 2013-03-29 09:13:44 -01:00
Sebastiaan Janssen
a33ae696a2 Fixes U4-2014 Can't install XSLTSearch 3.0.4 with Umbraco 6.0.3
Updated the topological sorter to only add items that exist in the indexes
2013-03-29 08:46:09 -01:00
Sebastiaan Janssen
2705efb809 Updated file for WebPI builds 2013-03-29 08:34:34 -01:00
Shannon Deminick
20fb27f7e1 Fixed server registration ctor and factory to ensure IsActive is correct. 2013-03-28 11:27:13 +06:00
Shannon Deminick
c8e20cf64b Fixes: #U4-2012, #U4-2005 2013-03-28 09:07:36 +06:00
Sebastiaan Janssen
648d631151 Opening new branch 2013-03-27 14:48:13 -01:00
Sebastiaan Janssen
27c0c4d64e Opening new branch 2013-03-27 14:47:35 -01:00
Sebastiaan Janssen
52cf559536 Closing 4.11.6 branch 2013-03-27 12:00:18 -01:00
Sebastiaan Janssen
c9b0362c62 Closed 6.0.3 branch 2013-03-27 11:54:12 -01:00
Sebastiaan Janssen
11e5bdf556 Added tag release-6.0.3 for changeset aed55cba2900 2013-03-27 11:14:18 -01:00
Sebastiaan Janssen
3d0be3836c Added tag release-4.11.6 for changeset 14338b0ab173 2013-03-27 11:13:56 -01:00
Sebastiaan Janssen
2bc33e0115 Merge 2013-03-27 08:58:34 -01:00
Sebastiaan Janssen
8576d9c67e Bump version to 4.11.6 2013-03-27 08:56:30 -01:00
Shannon Deminick
3accecd504 Merge with 6.0.3 2013-03-27 03:09:57 +06:00
Shannon Deminick
a0651f4383 Merge with 4.11.6 2013-03-27 03:09:36 +06:00
Shannon Deminick
9452d5fd09 adds patch for #U4-1754 and updates 2013-03-27 03:08:37 +06:00