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

112 Commits

Author SHA1 Message Date
jakobdyrby
f8b4caea85 Fixes 
now the package does not die hard if data type not found
directories in umb packages are now ignored - not sure if this is th right behaver
small logical errors
 2014-06-16 12:12:51 +02:00
jakobdyrby
4c6ec3ac4b Removed som out commentet code 2014-06-16 12:12:48 +02:00
jakobdyrby
46eaba668c Missed this in last commit 2014-06-16 12:12:48 +02:00
jakobdyrby
70fcd6fab7 more updates 2014-06-16 12:12:44 +02:00
jakobdyrby
45076491cb Added new PackagingService 2014-06-16 12:12:43 +02:00
Shannon
3df2d03fc8 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Models/IPublishedContentProperty.cs
	src/Umbraco.Core/Models/PublishedContent/IPublishedContentExtended.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedFragment.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
	src/Umbraco.Web/PublishedContentPropertyExtension.cs
	src/Umbraco.Web/Search/ExamineEvents.cs
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/umbraco.cms/businesslogic/template/Template.cs
 2014-05-05 12:49:06 +10:00
Morten Christensen
5a862f5c64 Fixes import of nested dictionary items #U4-4663 2014-05-01 13:51:33 +02:00
Shannon
86e18ef89d Fixes merge issues 2014-04-29 13:36:21 +10:00
Shannon
e0c3eda675 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Models/DataValueSetterTests.cs
	src/Umbraco.Web.UI/web.Template.config
	src/umbraco.cms/businesslogic/media/Media.cs
	src/umbraco.cms/businesslogic/member/Member.cs
 2014-04-29 13:06:10 +10:00
Shannon
31e018c045 Moves XML serialization for content/media/members to a resusable class: EntityXmlSerializer to remove the circular references we have by using the ToXml extension methods from directly in the services. This has been completed for the ContentService, next is Media and Member services. Updates the ContentService to not perform CUD operations for preview or published xml, this is now done at the repository level and now done in a single transaction for the saving and publishing events. Still need to do that for the member and media services too and the remaining methods in the content service 2014-04-28 17:28:40 +10:00
Shannon
1f581c1fcb Merge branch 'patch-1' of https://github.com/aaronpowell/Umbraco-CMS into aaronpowell-patch-1 2014-04-28 12:39:20 +10:00
Shannon
7d556a0318 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderExtensions.cs
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/ICacheProvider.cs
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/PreValue.cs
	src/Umbraco.Core/Models/PropertyType.cs
	src/Umbraco.Core/Services/DataTypeService.cs
	src/Umbraco.Tests/Models/Collections/PropertyCollectionTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Models/PublishedProperty.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs
 2014-04-17 18:10:42 +10:00
Shannon
595b039ebe Working on U4-4701 Fixup DataTypeService and repository with cache, pre-values are now persisted properly using units of work with it's own mini internal repo. 2014-04-17 17:41:08 +10:00
Aaron Powell
f45edbe2fe U4-4629 - Detecting existing macros 
By setting the ID of the macro the repository layer will update the existing instance rather than trying to create a new one, which would result in a duplicate alias and that violates a table index.
 2014-04-07 18:10:09 +10:00
Shandem
09428d703c Merge pull request #298 from KevinJump/6.2.0--PackageServiceFixes 
6.2.0  package service fixes
 2014-03-19 14:43:19 +11:00
Shannon
a60e2318ad Fix Null Prevalue Values on Export of DataTypes 
Exporting a DataType that has a Numeric pre-value that has no value
causes an Exception - added null checking to pre value.value
 2014-03-17 13:23:26 +11:00
Shandem
b4cce4860f Merge pull request #313 from KevinJump/7.1.0---Null-DataType-PropertyValue-Fix 
Fix Null Prevalue Values on Export of DataTypes
 2014-03-17 13:20:24 +11:00
Shannon
ad3c004d95 Added another property to a migration to specify a minimum current version - needed for specifically targeting a migration 'from' a version. Finally got mysql upgrading from 6.1 to 7.1 without issue, had to re-order a few things and ensure some migrations don't execute based on the 'from' version. 2014-03-15 20:15:01 +11:00
Shannon
c29dbf444a Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2014-03-15 19:02:59 +11:00
Morten Christensen
b680f87c12 Adding a note about the usage of the PackageInstallation class in the PackagingService 2014-03-14 12:14:43 +01:00
Morten Christensen
8db6633c91 Initial implementation of a new package installation approach based on PR-297. Everything is left internal as we don't know when something like this can be introduced. 
Idea is to be able to install a complete package using the PackagingService, so that we eventually can obsolete the old Packager/Installer-code.
 2014-03-14 12:11:38 +01:00
Kevin Jump
20d92432b2 Fix Null Prevalue Values on Export of DataTypes 
Exporting a DataType that has a Numeric pre-value that has no value
causes an Exception - added null checking to pre value.value
 2014-03-11 06:55:59 +00:00
Kevin Jump
366697f4eb PackageService: Fixes Single import for DataTypes 
Importing a file with a single data type failed, because the DataType
element is at the root when exported.
 2014-02-18 15:10:11 +00:00
Kevin Jump
987644379e Fix U4-4119 - Export Fails for Generic Properties 
Adds null checking for PropertyGroupID on export so that properties with
no group (tab) don't throw an exception.
 2014-02-18 15:07:47 +00:00
Kevin Jump
57c68daf38 Fix Template Import when template has no master 
Importing a template with no master template (i.e when it's at the root)
caused an error. Added check for MasterTemplateId != null - (tried
.IsValueCreated but that generated a object not set exception)
 2014-01-23 16:07:07 +00:00
Kevin Jump
a705561a51 Fix Importing Macro when macro already exists 
ParseMacroElement called by ImportMacro was no checking for to see if
the macro or properties already exists - caused SQL errors on import of
macro. Added check to look for existing macro, and only add new
properties on import (in line with other import methods)
 2014-01-23 16:05:08 +00:00
Kevin Jump
a7107f01e8 Single DataType import Fix 
Importing a file with a single data type failed, because the DataType
element is at the root when exported.
 2014-01-23 15:57:50 +00:00
Kevin Jump
5663b6890f Revert "Export Template fails when template has no master value" 
This reverts commit a2905c13f6.
 2014-01-22 21:35:16 +00:00
Kevin Jump
a2905c13f6 Export Template fails when template has no master value 2014-01-22 21:29:49 +00:00
Kevin Jump
e8f7a83f68 Fixed: U4-4119 - Export ContentType fails for Generic Properties 
Adds Null checking for PropertyGroupID so that an exception is avoided
when the propertyType is in the Generic Properties group (and has no ID
assigned)
 2014-01-22 19:50:21 +00:00
Sebastiaan Janssen
10a4eb3ddc Fix Duplicate attribute YSOD (key was already added in the base class) 2014-01-20 12:02:52 +01:00
Morten Christensen
dddb38d4ee Adding comment to private method for clarity 2014-01-19 15:23:05 +01:00
Morten Christensen
ba27acead9 Adding unique key to xml for contentbase exports 2014-01-19 15:23:04 +01:00
Morten Christensen
bb30d5ebd2 Refactoring Macro import method in PackagingService 2014-01-19 15:23:02 +01:00
Morten Christensen
2ae3b09b8c Updating PackagingService to use the newly added event args 2014-01-19 15:23:02 +01:00
Morten Christensen
6c37b33509 Adding export method for macros in the PackagingService and changing the ctor to accept the MacroService, so we can also add an import method. 2014-01-17 15:29:51 +01:00
Morten Christensen
9164567abe Adding export of templates to PackagingService 2014-01-17 13:55:34 +01:00
Morten Christensen
d6b3d115b0 Correcting the naming of events in the PackagingService 2014-01-14 15:09:21 +01:00
Morten Christensen
9e9b94b1d5 Correcting raiseEvents parameter for dictionary items 2014-01-14 15:09:20 +01:00
Shannon
4eb1ef3444 fixed up merge issues 2014-01-13 14:54:15 +11:00
Shannon
0f503fc320 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
	src/Umbraco.Tests/Services/Importing/ImportResources.resx
	src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
	src/Umbraco.Tests/Services/PackagingServiceTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.cms/businesslogic/workflow/Notification.cs
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
 2014-01-13 14:08:23 +11:00
Morten Christensen
d5d4dc9561 Adding event handlers to new import and export methods in the PackagingService 2014-01-10 16:24:20 +01:00
Morten Christensen
be2c72f8b4 Adding new methods to the IPackagingService interface 2014-01-10 16:05:19 +01:00
Morten Christensen
6bfdbe3e8a Updating the legacy Installer class to use the new methods in the PackagingService 
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/umbraco.cms/businesslogic/Packager/Installer.cs
 2014-01-10 15:42:43 +01:00
Morten Christensen
7095b21eb4 Removing some internal experimental stuff that isnt used 2014-01-10 15:40:41 +01:00
Morten Christensen
efce912332 Adds import and export of languages along with tests 
Conflicts:
	src/Umbraco.Tests/Services/PackagingServiceTests.cs
 2014-01-10 15:40:28 +01:00
Morten Christensen
b01721c2a9 Adding Export of DictionaryItems including test 
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Services/PackagingServiceTests.cs
 2014-01-10 15:38:43 +01:00
Morten Christensen
4f2a807327 Updates from PR#127 from Lars-Erik. Had to manually copy in the changes because the PR was closed. 
Adds Import of Dictionary Items to the PackagingService along with tests and a fix for the DictionaryRepository.

Conflicts:
	src/Umbraco.Tests/Services/Importing/ImportResources.resx
	src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
	src/umbraco.cms/businesslogic/Packager/Installer.cs
 2014-01-10 15:37:44 +01:00
Morten Christensen
955573256d Updating the legacy Installer class to use the new methods in the PackagingService 2014-01-10 15:11:07 +01:00
Morten Christensen
d963f5cd7d Updating a few methods that are made public in 7.0.2 2014-01-10 14:57:27 +01:00