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

8921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Morten Christensen
be2c72f8b4 Adding new methods to the IPackagingService interface 2014-01-10 16:05:19 +01:00
Morten Christensen
62f46d531f Fixing merge issue 2014-01-10 16:04:50 +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
b33a265ea4 Moving events out of the repository scope. 
Adding Get Language by Iso Code method
 2014-01-10 15:39:15 +01:00
Morten Christensen
db849c1e36 Adding languages xml to existing xml file for testing purposes 2014-01-10 15:38:57 +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
perploug
d97a0f5b6c Adds missing PluginController Attribute to updatecheckercontroller 2014-01-10 11:21:55 +01:00
Shannon
a510396a57 fix merge issue 2014-01-10 17:07:28 +11:00
Shannon
297d54ec98 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/umbraco.cms/businesslogic/CMSNode.cs
 2014-01-10 17:05:23 +11:00
Shannon
531306a091 Created notifications repository and service with unit tests, then need to start integrating that so notifications are properly sent. 2014-01-10 17:03:00 +11:00
Shannon
4346f73159 Fixes naming conventions from old Notification class 2014-01-10 15:13:25 +11:00
Shannon
3cb5754ff2 Fixed some null checks 2014-01-10 12:20:49 +11:00
Shannon
bf5bb8bc70 obsoletes imageHelper in favor of the new mediaHelper, updates the link picker to fix: U4-3882 Can't Link to Non-Image Media in 7.0.1 2014-01-10 12:11:52 +11:00
Shannon
7b7ad4d350 completes: U4-3991 Ensure macroservice events are public 2014-01-10 11:20:37 +11:00
Shannon
544a0756f3 Fixes: U4-3995 Remove Contour language keys from deployed language files 2014-01-10 00:43:53 +11:00
Shannon
934215307d Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-10 00:22:09 +11:00
Shannon
349825b4f8 Fixes merge issues 2014-01-10 00:21:58 +11:00
Morten Christensen
f3f1a161e4 Adding AreRelated method to the RelationService 2014-01-09 14:12:58 +01:00
Shannon
c088187a13 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxContext.cs
	src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderExtensions.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
	src/umbraco.cms/packages.config
	src/umbraco.controls/packages.config
	src/umbraco.editorControls/packages.config
	src/umbraco.macroRenderings/packages.config
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
 2014-01-10 00:09:38 +11:00
Shannon
4db6ce4b22 Fixes various issues relating to File Repositories and Services: U4-4014 FileRepositories offer no way to create folders, U4-4013 The models that the FileService produces causes security exceptions, U4-3993 Replace system.io calls in umbraco.scriptTasks legacy task 
updates to latest CDF
 2014-01-09 18:08:13 +11:00
Shannon
72a366d0dc Fixes: U4-4012 When loading in a lot of separate assets in a manifest CDF is throwing exceptions with a 'too long query string' - updates to latest CDF 2014-01-09 15:58:06 +11:00
Shannon
fc18189fc8 fixes a null check on membership provider, completes: U4-3962 publicize IMapperConfiguration 2014-01-09 13:32:39 +11:00
Shannon
49cfeee5b0 Fixes: U4-3880 Custom parameter editor with JSON valueType 2014-01-09 12:49:33 +11:00
Shannon
01d09548aa fixed merge issues 2014-01-09 10:54:02 +11:00
Shannon
1ff049a063 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
 2014-01-09 10:38:31 +11:00
Shannon
7c720460f5 Fixes: U4-3876 MySQL cmsContentXml Migration Error on 7.0.1 Upgrade 2014-01-09 10:33:35 +11:00
Morten Christensen
d0c0ec56a4 Adding event handlers to the PackagingService 2014-01-08 14:13:16 +01:00
Morten Christensen
3c965e8c32 Updating relation event handlers 2014-01-08 14:13:15 +01:00
Morten Christensen
5bcd6a9982 Adding interface to PackagingService 2014-01-08 14:13:15 +01:00
perploug
525477f84f Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-08 13:27:42 +01:00
perploug
7d051dffbb adds editing function to media picker controller 2014-01-08 13:27:34 +01:00
perploug
c5a7eab1d5 WIP: adds cropper directive 2014-01-08 13:27:04 +01:00
perploug
115c8b15fd updates jquery ui to 1.10.3 2014-01-08 13:26:34 +01:00
Morten Christensen
29c8f065f7 Implementing Saving/Saved and Deleting/Deleted events for Relations and RelationTypes. 
Fixes U4-3992 RelationService doesnt have any events.
 2014-01-08 12:52:55 +01:00
Shannon
961755336a adds another test for #U4-3876 2014-01-08 20:34:20 +11:00
Shannon
e0aff8a1e4 adds a unit test 2014-01-08 20:25:35 +11:00
Shannon
6fa0c627a5 working on #U4-3876 2014-01-08 20:19:08 +11:00
Shannon
b3c2574aac working on #U4-3876 2014-01-08 20:04:26 +11:00
Shannon
98b2320421 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Tests/TreesAndSections/SectionTests.cs
 2014-01-08 18:41:01 +11:00
Shannon
66a63b3cbb ignores these tests for now, they are successful when running isolated but as a whole they don't pass because of something with the legacy data layer. 2014-01-08 18:39:37 +11:00
Shannon
077f3468b9 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2014-01-08 18:20:49 +11:00
Shannon
21c5b6fe02 fixes user lookup on legacy provider 2014-01-08 18:20:18 +11:00
Shannon
3274d873a9 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
 2014-01-08 18:13:35 +11:00
Shannon
ffed85640d fixes provider user key issue 2014-01-08 18:12:07 +11:00
Shannon
250f082346 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Tests/TreesAndSections/SectionTests.cs
 2014-01-08 17:12:06 +11:00
Shannon
cdbf89ee57 Fixes up the unit tests 2014-01-08 17:08:13 +11:00
Shannon
056b13eb98 fixes up the double member creation in the createuser method 2014-01-08 16:29:09 +11:00