Shannon Deminick
265fd6b91c
Merge with 6.0.1
2013-02-23 00:19:05 +06:00
Shannon Deminick
3c41871e59
Fixes: #U4-1748
2013-02-22 21:42:38 +06:00
Shannon Deminick
038b4300ba
Ensures plugin cache is cleared on install
2013-02-22 21:29:48 +06:00
Shannon Deminick
958d7940f2
Manually applies changes from 6.0.1 to installer files from revisions 8033aae62d4a, fdeca60cb2c1
2013-02-22 21:02:24 +06:00
Shannon Deminick
a3f7ef7002
Merge with 6.0.1
2013-02-22 20:04:57 +06:00
Shannon Deminick
e2d806f5d9
Merge with 4.11.5
2013-02-22 20:00:10 +06:00
Shannon Deminick
7a47d63b48
Fixed remaining tests
2013-02-22 19:55:22 +06:00
Sebastiaan Janssen
596c4ac329
Fixes: U4-1721 V6: Publish of a page ends in YSOD when using legacy schema
2013-02-22 12:36:24 -01:00
Sebastiaan Janssen
8ad8a3239a
Make sure that the installer doesn't crash if dbSettings are null
2013-02-22 12:01:47 -01:00
Sebastiaan Janssen
4648a8c103
Fixes U4-1746 Duplicate image source (src) when inserting resized image in tiny
...
mce (richtext editor)
2013-02-22 11:41:01 -01:00
Sebastiaan Janssen
2df05da7fc
Fixes U4-1746 Duplicate image source (src) when inserting resized image in tiny
...
mce (richtext editor)
2013-02-22 11:41:01 -01:00
Sebastiaan Janssen
87947871d1
Have to add new Examine version to Web.UI as well, else the build output from
...
build.bat file will not be able to find it.
2013-02-22 09:57:58 -01:00
Sebastiaan Janssen
87fee572ff
Enable nuget package restore for teamcity, upgrade examine dll
2013-02-22 09:47:23 -01:00
Shannon Deminick
36eb340c11
Merge
2013-02-22 10:49:15 +06:00
Shannon Deminick
aa929e8091
Merge with 6.0.1
2013-02-22 10:45:04 +06:00
Shannon Deminick
e00c0fc447
Another update to examine to fix another issue: 10362
2013-02-22 10:41:42 +06:00
Shannon Deminick
2ebfbd5d08
Fixed one test with merging
2013-02-22 10:34:43 +06:00
Shannon Deminick
567be2aecf
Fixed up merge issues
2013-02-22 07:08:45 +06:00
Shannon Deminick
6a6ac99c34
Merge with 6.0.1
2013-02-22 06:58:44 +06:00
Shannon Deminick
7137c57ac9
merge issue with mediaxml file
2013-02-22 06:49:02 +06:00
Shannon Deminick
d68b4d97f6
Fixing merge issues
2013-02-22 06:43:52 +06:00
Shannon Deminick
89f7a3ec63
Clearly these files shouldn't be deleted :P
2013-02-22 06:23:03 +06:00
Shannon Deminick
96a62b57fb
Merge with 4.11.5
2013-02-22 06:21:12 +06:00
Shannon Deminick
7092a9ccbb
Reverted the macro engines and web proj's, it would seem as though 4.x on the build server hasn't
...
been configured for nuget package restor (or something like that)
2013-02-22 06:05:10 +06:00
Shannon Deminick
e9ea9b5e1b
Updates DynamicNode with some performance enhancements especially around things like HasProperty and GetProperty.
...
Also when it returned children, it was actually re-iterating over all children (going to the repo to find them even though
they were already resolved).
2013-02-22 05:44:17 +06:00
Shannon Deminick
fd1efb29ec
Fixes issue when saving settings to web.config, not sure how this error never came up before. Was missing a "\" between the path and "web.config".
...
Using Path.Combine is much safer than just string.Concat!
2013-02-22 04:45:20 +06:00
Shannon Deminick
cf4781153e
Fixes: #U4-873, #U4-888 - fixes media sorting in razor + MVC. Updates Nunit libs and Examine lib. Adds unit tests to
...
support new sorting fixes. Fixes up a few other issues with the legacy ExamineBackedMedia class, it will now handle all data
stored in Examine. Simplifies the Examine internal index sets to include all data.
2013-02-22 04:12:24 +06:00
Stephan
03fc0c868c
Core.Strings - fix more unit tests (resolvers init issues)
2013-02-21 16:53:25 -01:00
Shannon Deminick
ebed142cd5
Another fix for file sys test
2013-02-21 23:47:16 +06:00
Shannon Deminick
dced287c1c
Merge with 6.0.1
2013-02-21 23:08:14 +06:00
Shannon Deminick
76e5304233
Merge with 4.11.5
2013-02-21 23:07:59 +06:00
Shannon Deminick
d162aba14a
Fix for file system test
2013-02-21 23:07:37 +06:00
Shannon Deminick
bcd426092c
Merge with 6.0.1
2013-02-21 22:52:49 +06:00
Shannon Deminick
387398b044
Merge
2013-02-21 22:52:29 +06:00
Shannon Deminick
62ed7e0a53
Merge with 6.0.1
2013-02-21 22:48:45 +06:00
Shannon Deminick
635b8bd82e
Removes all need of UmbracoSettings.UseLegacyXmlSchema = false; in unit tests since the default is false.
2013-02-21 22:46:50 +06:00
Shannon Deminick
f2071379fc
Merge with 4.11.5
2013-02-21 22:40:24 +06:00
Shannon Deminick
ec075f5807
Merge
2013-02-21 22:38:38 +06:00
Shannon Deminick
566986201f
Changes ContentFinderByNiceUrlTests to not require a database by having an overloaded ctor param on
...
ContentFinderByNiceUrl to not require a domain lookup (up-ported from 6.0.x and 4.x logic). Changes
ContentFinderByAliasTests to not require a database by splitting the two tests, now there is also a
ContentFinderByAliasWithDomainsTests.
2013-02-21 22:32:44 +06:00
Shannon Deminick
a9947cda48
Merge with 6.0.1
2013-02-21 22:22:23 +06:00
Shannon Deminick
eb8875066c
Reverts LookupByNiceUrlTests to not require a database setup
2013-02-21 22:12:30 +06:00
Sebastiaan Janssen
dca90e6316
Merge
2013-02-21 15:09:20 -01:00
Sebastiaan Janssen
2a47b384d2
Merge
2013-02-21 15:08:43 -01:00
Sebastiaan Janssen
29e5872a0f
Merge with 4.11.5
2013-02-21 15:07:17 -01:00
Sebastiaan Janssen
df31fafec5
Update en_us umbracoembed file, had the wrong content
2013-02-21 15:06:37 -01:00
Shannon Deminick
5f28f279e0
Merge with 4.11.5
2013-02-21 22:03:42 +06:00
Shannon Deminick
828dc64035
Backports fix for FullpathToRoot in GlobalSettings... not sure how some unit tests have been working this whole time.
...
Changes UseLegacySchema default value to false... was set to true!?
un-ignores LookupByNiceUrl tests and still ensures it doesn't require a database to test by passing in an optional parameter
to LookupByNiceUrl to specify if we want to include domain lookups or not (default is true)
2013-02-21 22:02:56 +06:00
Shannon Deminick
1d9e445a42
Merge
2013-02-21 21:34:30 +06:00
Shannon Deminick
271b0691e2
Fixed up merge
2013-02-21 21:33:21 +06:00
Shannon Deminick
cf46df441a
Merge with 6.0.1
2013-02-21 21:17:47 +06:00
