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

10538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
59116fc7fa un-does the tag export/import, instead need to look at the internal of a simple publish (without save) to see if tags get written or not. 2014-06-30 17:05:34 +10:00
Shannon
a66670263f fixes null check 2014-06-30 17:04:59 +10:00
Shannon
1e1d49f305 fixes U4-5140 Package installation for content does not respect tags, however need to check with Morten if it's required because if we never actually publish content on package install then this wouldn't really matter. But surely we must publish on package install for some thing because starter kits are published... hrm. 2014-06-30 16:43:51 +10:00
Shannon
1be2706c30 fix merge 2014-06-30 15:09:41 +10:00
Shannon
eaf2956524 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
 2014-06-30 14:26:33 +10:00
Shannon
525280d466 fixed some tests 2014-06-30 14:09:36 +10:00
Shannon
496beca8f2 This Can_Find_Targetted_Migrations test needed a valid database to pass. This update ensures that the database is created with the old version 4.8 db schema. 2014-06-30 14:02:43 +10:00
Stephan
45e6127d00 U4-4866 - fix the build 2014-06-28 16:26:27 +02:00
Sebastiaan Janssen
5bee398d09 #U4-3838 fixed Due in version 7.1.5 
Fixes ContentService Copy uses IOHelper.MapPath but should use fs.GetFullPath and a few other instances where IOHelper was used
 2014-06-27 17:22:51 +02:00
Sebastiaan Janssen
c53d812742 #U4-3154 Fixed Deleting single media item in recycle bin does not use the FileSystemProvider 2014-06-27 16:26:22 +02:00
Sebastiaan Janssen
966a29954c #U4-5010 fixed 
Package editing view missing in distribution
 2014-06-27 16:25:57 +02:00
Morten Christensen
9f28aea10d This Can_Find_Targetted_Migrations test needed a valid database to pass. This update ensures that the database is created with the old version 4.8 db schema. 2014-06-27 13:23:54 +02:00
Morten Christensen
097014454f Fixing issue in MacroRepository which was causing a test to fail. 
Changing the alias of a macro property didn't alias work, so added a fallback to the Id of the property in the cases where the Alias wouldn't work.
 2014-06-27 12:42:15 +02:00
Morten Christensen
48143bc0c3 Minor updates to the Package installation and extraction as part of PR #417 2014-06-27 12:37:56 +02:00
Morten Christensen
75c26e4d92 Merge pull request #417 from netmester/package_installer_service 
Package installer service
 2014-06-27 10:58:10 +02:00
Shannon
ad4135f629 does a toarray to make sure it doesn't reiterate 2014-06-27 14:04:35 +10:00
Shannon
8e7ed865f0 Fixes: U4-5151 Backoffice controllers collide on name even if different namespace 2014-06-27 13:34:15 +10:00
Shannon
f627de2433 tweaks orange 2014-06-26 17:38:24 +10:00
Shannon
303aa07235 migrates most of the xml serialization from the packaging service to the EntityXmlSerializer 2014-06-26 17:32:38 +10:00
Shannon
b404cc6438 Fixes: U4-5141 Packager doesn't respect 'allow at root' or 'list view' 2014-06-26 17:18:00 +10:00
Shannon
80103e6155 Fixes: U4-4866 Select content root when creating a package 2014-06-26 16:55:44 +10:00
Shannon
4fbf65e684 Fixes: U4-4866 Select content root when creating a package 2014-06-26 16:45:59 +10:00
Shannon
0aeac407c5 removes extremely silly try catch all when using the packager - why was this here !? So that nobody would ever know why creating their package failed? 2014-06-26 16:33:56 +10:00
Shannon
be98ceea6c Fixes: U4-5011 Auto collapsing tree structure 2014-06-26 16:14:50 +10:00
Shannon
07e0cd2957 uses a better orange 2014-06-26 14:08:51 +10:00
Shannon
9da7d56b9c Fixes styling on installer alert box so it's contained within the pane 2014-06-26 13:58:09 +10:00
Shannon
5a3890159f Fixes: U4-5142 Fix the horrible orange warning color in the back office 2014-06-26 13:52:59 +10:00
Shannon
70da51113c Streamlines form error colors to be inline with the rest of our color scheme 2014-06-26 13:31:39 +10:00
Shannon
0f7c407a7c Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Services/LocalizationServiceTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs
 2014-06-26 11:51:25 +10:00
Shannon
392634eb76 bumps nuspec versions 2014-06-26 11:44:28 +10:00
Shandem
7bc5588d6d Merge pull request #420 from bjarnef/7.1.5_U4-3953 
Fix for U4-3953
 2014-06-26 11:38:25 +10:00
Shannon
259bc863f0 Removes Examine.dll deploy from nuspec 2014-06-26 11:32:43 +10:00
bjarnef
70514b88c5 Fix for U4-3953 
Installing package - installing message progressbar causes horizontal
scrollbar
 2014-06-26 02:57:47 +02:00
Shannon
582bafdefd Updates version 2014-06-26 10:02:09 +10:00
Shannon
9924ef2381 Merge branch '6.2.1' into 6.2.2 2014-06-26 09:57:16 +10:00
Morten Christensen
12cdd3326a The CopyFile extension method was not disposing the file stream, so any attempt to delete the source file afterwards would fail. 
Removing unused using statements.
 2014-06-25 16:00:21 +02:00
Shannon
859fbaaa05 Fixes: U4-5121 umbraco.content launches threadpool threads to reload the xml cache which causes lots of other issues 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/content.cs
 2014-06-25 19:02:49 +10:00
Shannon
27764a2c82 merge issue 2014-06-25 18:58:29 +10:00
Shannon
5fdcec6904 Fixes: U4-5121 umbraco.content launches threadpool threads to reload the xml cache which causes lots of other issues 2014-06-25 18:56:51 +10:00
Shannon
0b678f1d3b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	src/umbraco.cms/businesslogic/Packager/Installer.cs
 2014-06-25 15:59:20 +10:00
Shannon
72991334c4 little bit of code cleanup 2014-06-25 15:55:52 +10:00
Shannon
309adbfb20 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2014-06-25 14:36:09 +10:00
Shannon
c659d5b85e fixes dll ref 2014-06-25 14:35:14 +10:00
Shannon
3ecc974325 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
 2014-06-25 14:33:32 +10:00
Shannon
a4bf4b0977 Fixes: U4-5118 Examine not storing XML fragments - updates to latest examine 2014-06-25 14:19:31 +10:00
Shannon
bef6ce66f1 Updated core nuspec to include Examine 2014-06-25 14:19:06 +10:00
Shannon
a18a2198a8 removes comment 2014-06-25 12:25:27 +10:00
Shannon
38c4bc72cd Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 2014-06-25 12:03:53 +10:00
Shannon
7cf7ac687c last issue with state/keep alive timer 2014-06-25 12:03:31 +10:00
Shannon
6b626baffb Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 2014-06-25 11:56:56 +10:00