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
Shannon Deminick
1f40d726de
adds patch for #U4-1754
2013-03-27 02:59:42 +06:00
Shannon Deminick
2699611ba3
adds patch for #U4-1754
2013-03-27 02:58:59 +06:00
Shannon Deminick
d9121b4684
fixes merge
2013-03-26 22:12:35 +06:00
Shannon Deminick
132ec1702c
Merge with 6.0.3
2013-03-26 22:09:50 +06:00
Shannon Deminick
43795f0007
Merge with 4.11.6
2013-03-26 22:03:23 +06:00
Shannon Deminick
b1fa06bfe8
Removes unused code.
2013-03-26 22:02:49 +06:00
Shannon Deminick
4dc22b6ce4
Applies patch for #U4-497 for getting exceptions for xslt
2013-03-26 22:02:08 +06:00
Shannon Deminick
a4e3127704
Ensures that xslt can throw exceptions too with the new settings - #U4-497
2013-03-26 21:40:50 +06:00
Sebastiaan Janssen
d4ab60f8af
Merge with 4.11.6
2013-03-26 13:29:45 -01:00
Sebastiaan Janssen
883277125a
Can't use parameters here as the query gets butchered.
2013-03-26 13:27:46 -01:00
Sebastiaan Janssen
2678e23c7d
Update Resolves_Assigned_Mappers to make sure the unit tests run
2013-03-26 12:26:08 -01:00
Sebastiaan Janssen
8edfc0ffdd
Merge with 4.11.6
2013-03-26 09:53:59 -01:00
Sebastiaan Janssen
ff961abaab
Actual fix for U4-1987 Error when attempting to save document type
2013-03-26 09:50:48 -01:00
Sebastiaan Janssen
b2414c1ab8
Fixes U4-1987 Error when attempting to save document type
2013-03-26 09:33:08 -01:00
Sebastiaan Janssen
9dde86d591
Fixes U4-1999 When copying content with subcontent, the new subcontent data is a
...
direct reference to the old.
2013-03-26 08:39:50 -01:00
Sebastiaan Janssen
b4ce4fbdef
Logging warning when package installer can't create a property due to a missing
...
datatype for that property
2013-03-26 07:55:43 -01:00
Sebastiaan Janssen
4285484c1b
Update code comment
2013-03-26 07:19:39 -01:00
Sebastiaan Janssen
2fd299ebfc
Change TinyMCE to use the mediaservice to get the original image + some updates
...
to the new mediaservice method.
2013-03-26 07:15:22 -01:00
Morten Christensen
f545f293b1
Adding GetMediaByUrl method to MediaService cause Sebastiaan needs it for less hacky code.
2013-03-26 05:46:20 -01:00
Morten Christensen
4dc94d1e0b
Merge
2013-03-26 05:00:04 -01:00
Morten Christensen
b058b1e345
Removing LEFT JOIN from query as its already part of the builder
2013-03-26 04:59:56 -01:00
Morten Christensen
dfa1e73ddf
Continueing implementation of the EntityRepository and Service.
2013-03-25 18:54:12 -01:00
Sebastiaan Janssen
b745c0ae90
If the image is not resized, there's probably not going to be an underscore,
...
just query for the whole image source then.
2013-03-25 18:18:14 -01:00
Sebastiaan Janssen
f2efff5411
Temporary fix until we can fix this properly for U4-1812 - Changing Width or
...
Height in Insert Picture popup results in NaN in other dimension
2013-03-25 18:09:31 -01:00
Shannon Deminick
390f56a64d
Merge with 6.0.3
2013-03-25 20:54:49 +06:00
Shannon Deminick
04c623f19c
Merge
2013-03-25 20:54:31 +06:00
Shannon Deminick
633d88c8c4
Changed DefaultServerMessenger to have an overridable method to send the request, added some internals visible to.
2013-03-25 20:54:21 +06:00
Sebastiaan Janssen
9ef5890636
Changing sortorder on tabs now also re-orders the tabs in the contenttype editor
2013-03-25 13:33:32 -01:00
Sebastiaan Janssen
bc9fd04a36
Related to U4-1847 - Tabs weren't imported with the correct sort order and when
...
a datatype can't be found we should silently fail and not create the property
that wants that datatype (that's how v4 did it).
2013-03-25 12:49:43 -01:00
Sebastiaan Janssen
185c5d78f1
Query changed due to fix fe02cef72d87 that uses 1/0 instead of True/False
2013-03-25 11:27:54 -01:00
Brian Powell
3ea9963166
Fixes U4-1904 / U4-1905
2013-03-25 10:39:35 -01:00
Sebastiaan Janssen
ab40822a98
Fix merge issue by re-applying Stephen Roberts' patch
2013-03-25 10:30:55 -01:00
Sebastiaan Janssen
dffce76e29
Merge with 4.11.6
2013-03-25 10:24:36 -01:00
Sebastiaan Janssen
d1e02f506c
PropertyGroupId can be null
2013-03-25 07:51:44 -01:00
Morten Christensen
40a9da5ee0
Merge with 6.0.3
2013-03-23 07:24:27 -01:00
Morten Christensen
5e18d13178
Fixing parsing issue with saving boolean values in the Integer column for Members.
...
Related to issue U4-1989
2013-03-23 07:22:43 -01:00
Shannon Deminick
3b982b80f5
Fixes test issues, needed to disable application cache for these tests since the cache invalidation happens at the CacheRefresher level but for these
...
tests (any many other ones) we are not 'booting' umbraco with the Boot managers so the CacheRefreshers are not wired up to listen to events to clear
the cache. This puts us another step closer to having a proper global cache solution that will work for everything. At least now, all of the legacy
code is using the ApplicationCache which we can now control from a central location. Changed NiceUrlsProviderWithDomainsTests to only require a new db
schema per fixture.
2013-03-23 04:01:52 +06:00
Shannon Deminick
1cada5aeb5
Merge with 6.0.3
2013-03-23 02:35:21 +06:00
Shannon Deminick
1dfca6836d
Merge with 4.11.6
2013-03-23 02:34:59 +06:00
Shannon Deminick
dbbdd16bb9
Fixes: #U4-497
2013-03-23 02:34:34 +06:00
Shannon Deminick
64719586dc
Merge
2013-03-23 02:32:07 +06:00
Shannon Deminick
63d010f78f
Fixes: #U4-497
2013-03-23 02:31:24 +06:00
