yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,010 Commits 4 Branches 7 Tags
79567d4e8f7c6be4a12b21e5b2de41ea1304faa7
Commit Graph

9010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perploug
ba2fa2bff4 Legacy dialogs missing conversion, language + partial view 2014-01-14 14:33:11 +01:00
Sebastiaan Janssen
03090e85fd U4-4046 Rename "empty template" to "empty" 2014-01-14 13:51:08 +01:00
Sebastiaan Janssen
5c55d6a6e3 U4-4045 The "Empty" partial view snippet should have @inherits 2014-01-14 13:49:20 +01:00
Shannon
0632d73e32 fixes view state and err styling for protect page 2014-01-14 16:56:38 +11:00
Shannon
000c2637d6 fixes view state and err msg 2014-01-14 16:54:32 +11:00
Shannon
bf24e101d3 fixes some logic with the protect page if it's already protected 2014-01-14 16:53:32 +11:00
Shannon
08c837602f Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Models/MemberType.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2014-01-14 16:28:48 +11:00
Shannon
563867cd8b Temp fix for: U4-3968 Umbraco 7.01 - Membership - Public Access - Add Single User protection - crash, fixes protectPage so that it uses the membership provider to make changes, updates the UI logic so that if you choose an existing user it will you about it, fixes it so you cannot arbitrarily change a member's password. 2014-01-14 16:21:00 +11:00
Shannon
86c66511dd changes all calls from Member.InUmbracoMemberMode() to Membership.Provider.IsUmbracoMembershipProvider() and obsoletes the InUmbracoMemberMode 2014-01-14 14:17:28 +11:00
Shannon
eedd109332 Temp fix for: U4-3968 Umbraco 7.01 - Membership - Public Access - Add Single User protection - crash 2014-01-14 12:38:48 +11:00
Shannon
7d57521ad8 Fixes some thread safety issues with old membership API 2014-01-14 11:53:41 +11:00
Shannon
d5fc18dc95 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-14 11:44:11 +11:00
Shannon
e36b3d46e8 Fixes: U4-4039 @Umbraco.Field("writerName") etc. don't work any more 2014-01-14 11:43:56 +11:00
Sebastiaan Janssen
d8aa98e60c Temporary workaround for the ClientDependency dependency 2014-01-13 11:50:13 +01:00
perploug
8a8899397e Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-13 10:17:27 +01:00
perploug
dc69b5a825 WIP: cropper and gravity editors 2014-01-13 10:17:16 +01:00
perploug
df7691ada3 Adds missing mocks 2014-01-13 10:14:30 +01:00
perploug
1048df7e63 Fixes broken assembly browser for usercontrols 2014-01-13 10:14:09 +01: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