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

6793 Commits

Author SHA1 Message Date
Shannon
e36b3d46e8 Fixes: U4-4039 @Umbraco.Field("writerName") etc. don't work any more 2014-01-14 11:43:56 +11:00
Shannon
457560920d Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
 2014-01-13 19:15:16 +11:00
Shannon
e79c0ae2b5 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Services/NotificationService.cs
 2014-01-13 19:11:39 +11:00
Shannon
e74e8f9d73 Fixes: U4-4005 Member custom properties not saving from code, only from backend, wraps more of the getter functions in legacy member class with new member service methods, fixes paged result method when there are no results. 2014-01-13 18:36:08 +11:00
Shannon
23b0c89848 ensures the mail usage is disposed. 2014-01-13 17:28:49 +11:00
Shannon
285989e737 updated notification email links to only have edit since we currently don't support deep linking to dialogs. 2014-01-13 16:34:42 +11:00
Shannon
2c580d0b20 updates email notification link address 2014-01-13 16:21:46 +11:00
Shannon
3c1f6abd0d Fixes: U4-3830 Unable to get email notifications working in version 7 2014-01-13 16:13:53 +11: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
Shannon
aebc30c7a3 Removes the version specific info from the CDF and Examine references in all proj files. 2014-01-13 14:02:50 +11:00
Shannon
44bc365fdd Moves all notification sending logic to the notification service, improves performance during any action when notifications are to be sent, ensures emails are sent out async to not block up the current request. 2014-01-13 13:50:30 +11:00
Shannon
06defee410 Completed new NotificationService, moved Diff to Core 2014-01-13 13:05:25 +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
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
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
Morten Christensen
2467b5ee3b Removing some internal experimental stuff that isnt used 2014-01-10 14:53:27 +01:00
Morten Christensen
f86eb4b741 Adds import and export of languages along with tests 2014-01-10 14:48:55 +01:00
Morten Christensen
33b99073f0 Moving events out of the repository scope. 
Adding Get Language by Iso Code method
 2014-01-10 14:48:31 +01:00
Morten Christensen
880636c5a6 Adding languages xml to existing xml file for testing purposes 2014-01-10 14:47:31 +01:00
Morten Christensen
6e344f335e Adding Export of DictionaryItems including test 2014-01-10 13:08:33 +01:00
Morten Christensen
6b205bd725 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.
 2014-01-10 11:45:41 +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