yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,364 Commits 4 Branches 7 Tags
13e555f50b1eff0a2ed8d8aa8570a84efb83002b
Commit Graph

4364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
74362fba23 Merge 2013-03-22 22:11:26 +06:00
Morten Christensen
112502cf18 Fixes U4-547 2013-03-22 15:09:36 -01:00
Shannon Deminick
1db7f808c9 Merge with 4.11.6 2013-03-22 21:59:52 +06:00
Shannon Deminick
762cca145f Fixes: #U4-1931 - allow empty string in dictionary item. 2013-03-22 21:59:21 +06:00
Morten Christensen
65dc5eaeee Corrects incorrect sql query in the ContentTypeBaseRepository and looping through property types in the DataTypeService. 
Adds initial test fixture for the DataTypeService.
Fixes U4-1939
 2013-03-22 14:54:44 -01:00