Commit Graph

4014 Commits

Author SHA1 Message Date
Shannon Deminick
8d38cf3c44 Applying patch for #U4-1636 2013-02-19 22:11:55 +06:00
Shannon Deminick
a3a9ab069a Applying patch for #U4-1636 2013-02-19 22:09:55 +06:00
Morten Christensen
5b8beceea8 Merge 2013-02-19 13:46:45 -01:00
Morten Christensen
e4568520a9 Improves performance when working with DocumentTypes in the backoffice - related to U4-1714 2013-02-19 13:45:57 -01:00
Shannon Deminick
cbba628eaf Merge with 4.11.5 2013-02-19 20:18:15 +06:00
Shannon Deminick
c2d0e255df Fixes: #U4-1537 2013-02-19 20:17:17 +06:00
Shannon Deminick
e096890400 Fixes: #U4-1537 2013-02-19 20:12:13 +06:00
Morten Christensen
ec4b1c8f70 Fixes U4-1689 and U4-1719.
Refactoring UmbracoImageMediaFactory so it uses the extension method for uploading/setting images, so its a bit more DRY.
2013-02-19 11:06:00 -01:00
Morten Christensen
1af904435a Merge 2013-02-19 08:47:04 -01:00
Shannon Deminick
7b2f03ba50 Merge with 4.11.5 2013-02-19 06:20:12 +06:00
Shannon Deminick
005d3e7d64 Removes area routing for local surface controllers and BeginUmbracoForm, adds strongly typed Html.Action<T>
method for rendering SurfaceController child actions regardless of area (so you don't have to specify).
All relates to #U4-1727
2013-02-19 06:19:26 +06:00
Shannon Deminick
12f8638223 Fixes: #U4-1727 2013-02-19 06:18:51 +06:00
Shannon Deminick
137b0754d6 Removes area routing for local surface controllers and BeginUmbracoForm, adds strongly typed Html.Action<T>
method for rendering SurfaceController child actions regardless of area (so you don't have to specify).
All relates to #U4-1727
2013-02-19 06:11:58 +06:00
Shannon Deminick
7d1e9cfd72 Fixes: #U4-1727 2013-02-19 06:11:17 +06:00
Shannon Deminick
d01a39e0c6 Fixes merge issue 2013-02-19 04:10:01 +06:00
Shannon Deminick
73bd0137e3 Merge with 4.11.5 2013-02-19 03:57:24 +06:00
Shannon Deminick
e3f9e8c842 Fixes: #U4-552 2013-02-19 03:42:19 +06:00
Shannon Deminick
7a38726b26 Fixes: #U4-552 2013-02-19 03:40:36 +06:00
Shannon Deminick
a475f72d50 Fixes: #U4-1695 2013-02-19 02:25:57 +06:00
Shannon Deminick
36cadf39e9 Fixes: #U4-1695 2013-02-19 02:22:00 +06:00
Shannon Deminick
a559ef9f90 Fixes: #U4-1732 2013-02-19 00:59:21 +06:00
Shannon Deminick
b45f6e0393 Fixes: #U4-1732 2013-02-19 00:53:20 +06:00
Morten Christensen
b99ff6c981 Merge 2013-02-18 15:48:02 -01:00
Morten Christensen
81021f5821 Part of the fix for U4-1689
Adds an alternative to the naming of the media subfolders instead of using the PropertyId.
2013-02-18 15:46:18 -01:00
Sebastiaan Janssen
be83302b14 Fixes U4-1451 2013-02-18 13:22:12 -01:00
Sebastiaan Janssen
29724b352b Fixes U4-1451 2013-02-18 13:22:12 -01:00
Sebastiaan Janssen
83d7ea9ef1 Ignoring wrong unit test for now 2013-02-18 12:53:15 -01:00
Sebastiaan Janssen
95024442de Copy the umbracoSettings for PublishMediaStoreTests as well 2013-02-18 12:22:53 -01:00
Sebastiaan Janssen
69f54b5f22 Copy the umbracoSettings for LibraryTests as well 2013-02-18 11:57:58 -01:00
Sebastiaan Janssen
3404f95b2e Forgot one trailing slash in previous commit 2013-02-18 11:42:45 -01:00
Sebastiaan Janssen
e56738481b Adding trailing slash to failing routing tests.
The issue with these tests might again be because of the UmbracoSettings file, which has the trailing slash setting. But with the settings being reset after teardown the tests were still failing, so made these minor corrections which shoudl correspond to the default setting.
2013-02-18 11:38:07 -01:00
Sebastiaan Janssen
cb59dc353b Update version to 4.11.5 2013-02-18 10:31:43 -01:00
Sebastiaan Janssen
d1b75eac08 Update wrong config path in unit tests 2013-02-18 10:31:17 -01:00
Sebastiaan Janssen
1f7651d0e3 Set version to 6.0.1 2013-02-18 10:16:24 -01:00
Sebastiaan Janssen
8fabd4e4ed Merge 2013-02-15 12:05:46 -01:00
Sebastiaan Janssen
564d92bed7 Possible fix for TeamCity 2013-02-15 12:05:25 -01:00
Shannon Deminick
d73dd47e7b Merge 2013-02-15 18:56:24 +06:00
Shannon Deminick
95f103ccc2 Merge 2013-02-15 18:55:50 +06:00
Shannon Deminick
c21b232a33 Merge with 4.11.5 2013-02-14 23:34:58 +06:00
Stephan
0ace2fdae7 U4-1611 - fix xpath special chars escaping issues in published content store 2013-02-14 16:31:45 -01:00
Shannon Deminick
dfb2a31f26 Fixes up examine config for internal indexes: #U4-1710 2013-02-14 23:29:11 +06:00
Stephan
5da3541584 U4-1441 - bugfix 2013-02-14 16:27:27 -01:00
Shannon Deminick
ef86d2f1f1 Manually applies patch for #U4-1718 2013-02-14 23:26:29 +06:00
Stephan
be98425956 U4-1611 - fix xpath special chars escaping issues in published content store 2013-02-14 16:23:56 -01:00
Stephan
61d1f87611 U4-1441 - bugfix 2013-02-14 16:34:17 -01:00
Shannon Deminick
598d66ac7f Imports patch to fix: #U4-1718 2013-02-14 23:14:43 +06:00
Sebastiaan Janssen
a10a6d1af8 Need to wrap the login javascript in a placeholder for Concorde 2013-02-14 09:06:15 -01:00
Sebastiaan Janssen
7640908781 Need to wrap the login javascript in a placeholder for Concorde 2013-02-14 09:06:15 -01:00
Morten Christensen
b101e25e7a Correcting a check related to U4-1690.
Fixes a typo in an internal class and private method.
2013-02-13 08:05:04 -01:00
Morten Christensen
319f257ee5 Minor change related to U4-1672 2013-02-08 18:54:18 -01:00