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

8985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
0e6c199a7e working on U4-4011 Package installation will require either a full app refresh or we will need to re-lazy load in all of the assets but unfortunately we cannot lazy load in things like directives as angular doesn't like that, we have to re-load the browser. 2014-01-15 17:18:23 +11:00
Shannon
0bc39afdab fixes language drop down styles - was too big to fit 2014-01-15 15:39:35 +11:00
Shannon
cf3de52249 removes the old language.ascx webforms files 2014-01-15 15:36:28 +11:00
Shandem
3f0569af41 Merge pull request #285 from mrdrbob/U4-3831 
Fix for U4-3831.
 2014-01-14 20:17:32 -08:00
Shannon
9f078357a7 Fixes: U4-4030 RelatedLinksEditorValueConvertor can't be overruled and internal links are wrong 2014-01-15 15:17:03 +11:00
Shannon
bb837232ba Allows DefaultPropertyValueConverters to shadow other default converters, this allows us to have a hierarchy of default converters. This also fixes part of this issue: U4-4030 RelatedLinksEditorValueConvertor can't be overruled and internal links are wrong 2014-01-15 14:45:33 +11:00
Shannon
6d57afc71a ensures auth controller has IsBackOffice specified 2014-01-15 13:49:37 +11:00
Shannon
fd682efdb1 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2014-01-15 13:37:46 +11:00
Shannon
5c614a88a2 ensures webapi plugincontrollers are routed to /backoffice if [IsBackOffice] is specified 2014-01-15 13:29:17 +11:00
Shannon
f27a0c0461 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EmptyTemplate.cshtml
	src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
 2014-01-15 13:28:41 +11:00
Shannon
3ef9635406 Fixes: U4-4010 Member and user session gets mixed - fixes how we detect a back office request + unit tests and added new IsBackOffice attribute 2014-01-15 13:17:38 +11:00
Shannon
c527833081 Revert "adds editing function to media picker controller" 
This reverts commit 7d051dffbb.
This will only be contained in 7.1
 2014-01-15 10:59:05 +11:00
Shannon
5caf091406 Revert "WIP: adds cropper directive" 
This reverts commit c5a7eab1d5.
new cropper is only contained in 7.1 branch
 2014-01-15 10:55:22 +11:00
Shannon
5a29441640 Reverts GetByQuery and MNTP Xpath query WIP - is contained only in 7.1 2014-01-15 10:53:14 +11:00
Shannon
75a42fd0d6 fixes the protect page logic 2014-01-15 10:42:01 +11:00
Shannon
84da5f43a2 U4-4045 The "Empty" partial view snippet should have @inherits 2014-01-15 10:41:37 +11:00
Bob Davidson
0da7ed8d93 Fix for U4-3831. Removes form, adds ng-click with $event.preventDefault() to prevent premature saving. 2014-01-14 15:40:22 -06:00
Sebastiaan Janssen
0aa72e5026 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-14 15:21:38 +01:00
Sebastiaan Janssen
14cfd2a8df D'oh .. now properly renamed, in the csproj as well - U4-4046 Rename "empty template" to "empty" 2014-01-14 15:21:20 +01:00
Morten Christensen
d6b3d115b0 Correcting the naming of events in the PackagingService 2014-01-14 15:09:21 +01:00
Morten Christensen
7b1fd5378f Correcting the naming of events in the RelationService 2014-01-14 15:09:20 +01:00
Morten Christensen
9e9b94b1d5 Correcting raiseEvents parameter for dictionary items 2014-01-14 15:09:20 +01:00
perploug
cf837d783d Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-14 15:00:05 +01:00
perploug
3df44e2990 treesource editor changes to remove the search field 2014-01-14 14:59:55 +01:00
perploug
0c5ebb2674 Fixes umbPhotoGrid Filtering 2014-01-14 14:40:00 +01:00
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