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

4280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon Deminick
a76ffe8daf Backported changes from 6.1 to fix how RePublishAll behaves in the content service to ensure its the same as what was done with 
Document.RePublishAll
 2013-03-20 00:19:36 +06:00
Shannon Deminick
ee9f91b5cf Merge with 4.11.6 2013-03-15 11:31:34 +06:00
Shannon Deminick
db3f21429e Fixes infinite loop bug with string trimming. 2013-03-15 11:31:11 +06:00
Shannon Deminick
033692d7ee had some strange issues with unit tests, added error checks. 2013-03-15 08:26:49 +04:00
Shannon Deminick
23146cb12a Merge with 4.11.6 2013-03-15 08:06:26 +04:00
Shannon Deminick
04b9607741 Fixes: #U4-1916 and another issue for vdirs, added unit tests, changed UI web project to always 
launch in a VDIR.
 2013-03-15 08:03:19 +04:00
Morten Christensen
c4aa9095f2 Fixes U4-1858 by ensuring that the text field is reset before setting or removing a value 2013-03-13 20:24:21 -01:00
Morten Christensen
79ce586c8b Fixes U4-1808 by removing the database lookup from an id that was resolved from the media url 2013-03-13 19:26:22 -01:00
Morten Christensen
8fba03c05d Fixes U4-1863 and U4-1908 by ensuring that content and media are loaded in the same manner through the new api 2013-03-13 18:55:25 -01:00
Shannon Deminick
2fdcb9164a Fix merge issues 2013-03-12 00:19:06 +04:00
Shannon Deminick
7404a1f93d Merge with 4.11.6 2013-03-12 00:14:50 +04:00
Shannon Deminick
c8b8b28e9b applies patch for #U4-1890 2013-03-12 00:10:59 +04:00
Shannon Deminick
5bd2571395 Merge 2013-03-12 00:01:14 +04:00
Shannon Deminick
c0cd157e60 applies patch for #U4-1890 2013-03-12 00:00:55 +04:00
Sebastiaan Janssen
ac2f9b172c .transformed files are auto-generated and shouldn't be under source control 2013-03-11 17:15:30 -01:00
Sebastiaan Janssen
b8e4a73c3b Revert Casey's mistakenly added files 2013-03-11 15:55:35 -01:00
Shannon Deminick
63192f3a65 Merge 2013-03-11 22:04:06 +06:00
Shannon Deminick
727f62d418 Merge with 4.11.6 2013-03-11 21:49:27 +06:00
Shannon Deminick
68c4255a51 updates proper error handling for razor script macros 2013-03-11 21:49:04 +06:00
Shannon Deminick
187af3e361 Fixed merge issue 2013-03-11 21:23:35 +06:00
Shannon Deminick
c6f29a50d6 Merge with 4.11.6 2013-03-11 21:17:57 +06:00
Shannon Deminick
d07212c89b Fixed changes with new MacroErrors config and how macros are rendered so it supports all macro types and also fixes up a bit of code 
in the umbraco.macro class.
 2013-03-11 21:06:02 +06:00
Shannon Deminick
28c55320a1 Updates the pull request for handling macro errors. 
Backports fixes for partial view macros from 6.x - U4-1488, U4-1844, U4-1730, U4-1843
 2013-03-11 20:11:11 +06:00
Morten Christensen
cb0dd70434 Minor change to the SqlSyntaxProvidersResolver in the CoreBootManager as per Shannons review. 2013-03-11 12:44:12 -01:00
Shannon Deminick
fd58017e97 imported patches for pull request spudstuff/u4497 2013-03-11 18:49:45 +06:00
Morten Christensen
928d92fce4 Making the Sql Syntax Providers public and changing a few names and bits for consistency. 
Adding resolver for the syntax providers and wiring it up in the boot manager.
 2013-03-09 10:43:34 -01:00
Casey Neehouse
09408b898e Merge 2013-03-08 19:38:33 +05:00
Morten Christensen
d1b05332c5 Manually adds fix for U4-1869 from 6.0.3 branch 2013-03-07 20:28:13 -01:00
Morten Christensen
836b0f39c2 Additional correction of the implementation for U4-1869 2013-03-07 20:19:39 -01:00
Morten Christensen
1b01386673 Changing the initial fix of U4-1869 to use UrlReplacingCharacters 2013-03-07 19:56:59 -01:00
Morten Christensen
2a09f02afb Fixing incorrect sql syntax when the query contains two expressions. 2013-03-07 19:56:10 -01:00
Morten Christensen
ee95434cea Implements U4-1869 by adding the 3 characters to the list of reserved characters. 2013-03-07 19:04:25 -01:00
Casey Neehouse
caad0afed8 Corrects u4-1870 - Refactor Load Content SQL to check if ID is in published list 
versus using a join that can cause duplicate entries.
 2013-03-07 21:00:31 +05:00
Morten Christensen
fe08e7fc2f Fixes U4-1865 by excluding trashed items from GetByLevel method for both Content and Media 2013-03-07 13:42:14 -01:00
Morten Christensen
4ad96b49e7 Fixes U4-1862 2013-03-07 13:35:17 -01:00
Morten Christensen
9a1bb4a2dd Adding unit test to assert issue with issue with creation of property types outside a property type group. 
Fixes U4-1861.
 2013-03-07 13:33:22 -01:00
Sebastiaan Janssen
c39f902ed5 And one more fix for U4-1845 to make upgrades succeed as well 2013-03-06 14:30:09 -01:00
Sebastiaan Janssen
b7dc052cb2 Additional fixes for U4-1845 to maintain compatibility for people using the 
wrong connection string
 2013-03-06 14:09:01 -01:00
Morten Christensen
0c77114cd5 Fixes U4-1845 by correcting the sql ce connectionstring 2013-03-06 13:36:03 -01:00
Morten Christensen
222a5237b0 Version updated to 6.0.3 2013-03-06 12:03:01 -01:00
Morten Christensen
de55cb8392 Correcting fix for U4-1835 2013-03-06 08:32:05 -01:00
Morten Christensen
df164ee618 Fixes U4-1835 by checking if the value is null before running the regex validation against the value. 2013-03-06 08:02:09 -01:00
Morten Christensen
21b0687a57 Fixes U4-1837 by syncing tree after saveing DataTypeDefinition 2013-03-06 07:57:00 -01:00
Morten Christensen
9310efa280 Fixes U4-1831 by catching exception if there is no current logged in user. 2013-03-06 07:54:09 -01:00
Morten Christensen
a41b55a9e6 Fixes U4-1846 2013-03-06 07:50:20 -01:00
Morten Christensen
af2d8a4755 Fix related to U4-1407 but for Media. We already committed this fix for Content. 2013-03-06 07:49:29 -01:00
Shannon Deminick
d48e339b81 Fixes: #U4-1844, #U4-1730, #U4-1843 2013-03-06 04:12:28 +06:00
Shannon Deminick
9b6d498cf7 Merge with 4.11.6 2013-03-06 03:17:47 +06:00
Shannon Deminick
62d365573f Back ports fixes for: #U4-1614, #U4-793 - preview working properly in mvc 2013-03-06 03:17:18 +06:00
Shannon Deminick
04bf011fcd Merge with 4.11.6 2013-03-05 23:55:09 +06:00