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

3795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon Deminick
48202cfa09 Merge with 6.0.0 2013-01-23 18:50:44 +03:00
Morten Christensen
a95c129116 Refactoring a few methods in the ContentService, so the omitCacheRefresh parameter isn't exposed in the new api, as its only relevant to the old api. 
Correcting the calls from Document to the internal methods in the ContentService, which ensures that the cache isn't refreshed as its handled elsewhere.
Correcting broken unit test after having changed the GetDescendents method.
 2013-01-22 11:23:33 -01:00
Morten Christensen
72ff03f142 Fixes U4-1512 by using the same safe alias method as in the legacy code base. 
This should ensure that published content aliases has the same format as in v4.
 2013-01-22 08:44:06 -01:00
Sebastiaan Janssen
f4574b6014 Merge 2013-01-21 15:42:08 -01:00
Morten Christensen
2dde71abb3 Moving the sql ce binaries from the UmbracoCms.Core to UmbracoCms package as Lee K. has a point. 
The Sql Ce binaries located in the Content/bin folder are only relevant when setting up a site.
 2013-01-21 15:35:39 -01:00
Morten Christensen
e55593fc34 Merge 2013-01-21 15:27:42 -01:00
Sebastiaan Janssen
1c6346233e Added tag Release-6.0.0-RC for changeset 56015ac26f5a 2013-01-21 15:27:38 -01:00
Morten Christensen
00e316b5bd Minor update to AssemblyInfo 2013-01-21 15:27:22 -01:00
Sebastiaan Janssen
652abe3838 Usercontrols defined in v4 didn't work as they're saved without the tilde 2013-01-21 15:26:56 -01:00
Morten Christensen
9c8c1d405b Merge 2013-01-21 14:52:27 -01:00
Morten Christensen
4bf9cf270d Fixes Move when parent is unpublished. 2013-01-21 14:50:58 -01:00
Sebastiaan Janssen
f547e21f0b Fixes U4-1482 Regression - RTE unable to edit hyperlink on image 2013-01-21 14:21:29 -01:00
Sebastiaan Janssen
675cc0b850 Show Allow At Root on a seperate pane 2013-01-21 13:02:51 -01:00
Sebastiaan Janssen
07a8b1de79 Fixes double qoutes in navigation.cshtml razor template 2013-01-21 12:52:31 -01:00
Sebastiaan Janssen
d3bdb8b743 log4net.xml doesn't exist, so don't include it 2013-01-21 12:45:33 -01:00
Sebastiaan Janssen
04d1bf3604 Include any version comments in the about dialog 2013-01-21 12:45:18 -01:00
Sebastiaan Janssen
46a83e553b Include any version comments in the about dialog 2013-01-21 12:41:37 -01:00
Sebastiaan Janssen
801eb2c3d3 Change version to RC 2013-01-21 12:34:56 -01:00
Sebastiaan Janssen
cac1c4a296 Merge in language changes 2013-01-21 12:24:34 -01:00
Sebastiaan Janssen
84e4727ef5 Revert to explicit list of migrations. Migrations were enumerated multiple times 
so added ToList() to them.
 2013-01-21 10:01:14 -01:00
Shannon Deminick
e2b86cf2df Fixes: #U4-1504 - insert macro syntax for views issue. 2013-01-19 06:50:22 +03:00
Shannon Deminick
362e98ebe7 Merge 2013-01-19 06:43:13 +03:00
Shannon Deminick
3e28376ae7 Fixes: #U4-1472 - XmlHelper. 
Fixes: #U4-1488 - partial view macro engine issues.
 2013-01-19 06:38:02 +03:00
Morten Christensen
e1902a54f0 Merge 2013-01-18 13:53:09 -01:00
Morten Christensen
5cb865f4c4 Updating the MigrationContext to take the PetaPoco database via the ctor, so it can be used to fetch entries during migration. 
Changing the MoveMasterContentTypeData migration to use the fluent Update statement with dynamic entries from the database.
Adding IfDatabase condition for Update.
Updating a few tests, which were using the MigrationContext.
 2013-01-18 13:51:40 -01:00
NielsHartvig@UMBRACORATI.localdomain
480bd39687 Fixes U4-1437 Contact form in business starter kit doesn't work 2013-01-18 12:56:30 -01:00
Morten Christensen
1bd4cbdb99 Adds If-condition to Execute Sql migrations. 
Updates MoveMasterContentTypeData migration to have a Sql Server specific sql statement.
 2013-01-18 12:50:34 -01:00
Morten Christensen
efba265730 Merge 2013-01-18 12:06:34 -01:00
Morten Christensen
f6ceb937a1 Changes the CoreBootManager to resolve migrations through the use of the PluginManager instead of having the migration types hardcoded. 2013-01-18 12:05:00 -01:00
Morten Christensen
62bd1ce4fa Updates namespace for v6 migrations. 
Adds update parentId migration for MasterContentType.
 2013-01-18 12:00:29 -01:00
NielsHartvig@UMBRACORATI.localdomain
caea28afd0 Implements U4-1500 Make sure doctype import/export and packager can set root doctypes 2013-01-18 11:54:55 -01:00
Sebastiaan Janssen
035a09afba Merge 2013-01-18 11:45:42 -01:00
Sebastiaan Janssen
e8361c2ab5 Allow specified content types to be created at the root level 2013-01-18 11:45:01 -01:00
Morten Christensen
0292ca9bf3 Fixes issue with duplicated tags on inherited doc types. 2013-01-18 11:18:19 -01:00
Morten Christensen
9ef07ed2eb Fixes U4-1214 and U4-1484 for both Content and Media 2013-01-18 10:56:14 -01:00
Sebastiaan Janssen
307a7fa77b NuGet too: U4-1495 Include Umbraco assemblies' XML files to make use of comments 2013-01-18 09:15:21 -01:00
NielsHartvig@UMBRACORATI.localdomain
53ddda9f59 Fixes U4-1480 ContentBase.SetPropertyValue has no override for long datatype 2013-01-18 09:03:58 -01:00
Morten Christensen
98b8db7e3d Merge 2013-01-18 09:01:10 -01:00
Morten Christensen
b5a140945a Fixes U4-1479 by adding .ToList() to allowed templates, which ensures that the list is fetched from the database while the connection is still open. 
Fixing typo in usage of LogHelper in PhysicalFileSystem.
Ensures connection is closed after using TableExists for MySql.
Adds logging to UmbracoDatabase.
 2013-01-18 09:00:18 -01:00
Sebastiaan Janssen
f5ce9dc9d0 U4-1496 Remove Boot() method from WebBootManager - Applying 024896ba7bcf to v6 2013-01-18 08:54:53 -01:00
Sebastiaan Janssen
1304a9d791 Fixed U4-1495 Include Umbraco assemblies' XML files to make use of comments 2013-01-18 08:44:39 -01:00
Shannon Deminick
9106438317 Merge with 4.11.4 2013-01-18 02:35:59 +03:00
Shannon Deminick
c0b5525dd7 Removed 'Boot' method from WebBootManager as it was never supposed to be there in the first place. 
Removed test code from 'SurfaceController'.
Added comments to IApplicationEventHandler.
 2013-01-18 02:31:51 +03:00
Sebastiaan Janssen
ad62cf0123 Fix merge issue, sorry 2013-01-17 14:53:55 -01:00
Sebastiaan Janssen
d64bdc089d Merge with 4.11.4 2013-01-17 14:29:11 -01:00
Sebastiaan Janssen
36f8a8e1dd Fixed U4-1492 Insert image in RTE gives null reference error 2013-01-17 14:17:04 -01:00
Sebastiaan Janssen
88e2690717 Fixed U4-1414 SplitButtons in template editor aren't working 2013-01-17 10:50:51 -01:00
Sebastiaan Janssen
16f73b56ab Weird failing test for getting the date of a file, works only 10% of the time.. 2013-01-17 09:53:47 -01:00
Sebastiaan Janssen
47dc2e6214 Merge 2013-01-17 09:18:12 -01:00
Sebastiaan Janssen
c6483f0380 Revert e4bb9041cf54 as it was a breaking change 2013-01-17 09:16:45 -01:00