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

20060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
0dee1f0fac U4-10368 Need option to set username different than e-mail for AD compatibility 2017-09-05 22:35:40 +10:00
Shannon
66affa7f85 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-05 19:22:37 +10:00
Shannon
af9441010c Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7 2017-09-04 22:04:27 +10:00
Shannon
7926a0c676 Simplifies the change password logic with the back office so an admin user can easily change another user's password if they have access to the users section. Updates the controllers to populate the modelstate correctly, changes name of HasAppAccess to HasSectionAccess. Ensure we don't have duplicate ysod dialogs when there is an error. 2017-09-04 22:03:03 +10:00
Stephan
511e9bd3a4 Merge pull request #2160 from umbraco/temp-deploy-360 
deploy-360 - add IUniqueIdentifyingServiceConnector
 2017-09-04 13:52:49 +02:00
mikkelhm
895faf41b1 Update version to 7.6.7 2017-09-04 12:28:16 +02:00
Shannon
a0306f9d55 Fixes ability to reset your own password in the user section 2017-09-04 20:15:46 +10:00
Stephan
9a06c3a5ff Implement ILocalizationService.GetDictionaryItemKeyMap 2017-09-04 11:31:20 +02:00
Sebastiaan Janssen
44102df36f Merge pull request #2167 from umbraco/temp-U4-10370 
U4-10370 Culture and hostnames with "æøå" after /
 2017-09-04 11:25:55 +02:00
Shannon
0e0ab81155 Changes AllowManuallyChangingPassword by default to be false 2017-09-04 17:26:45 +10:00
Shannon
a608577a4f Merge branch 'dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Core/Security/BackOfficeUserStore.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2017-09-04 16:51:20 +10:00
Sebastiaan Janssen
617a91c57e Merge pull request #2119 from umbraco/temp-U4-10274 
U4-10274 Umbraco.MemberHasAccess isn't cached
 2017-09-01 15:45:55 +02:00
Sebastiaan Janssen
cb0e5414b9 Merge pull request #2155 from umbraco/temp-U4-10361 
U4-10361 Creating new member when `AllowManuallyChangingPassword="fal…
 2017-09-01 14:46:58 +02:00
Claus
22cef52261 removing using. 2017-09-01 13:50:51 +02:00
Claus
41e419a49e U4-10370 Culture and hostnames with "æøå" after / 2017-09-01 13:48:39 +02:00
Stephan
efbe97a01d Merge pull request #2149 from umbraco/temp-deploy-358 
Updates the underlying event args base class's AdditionalData diction…
 2017-08-31 18:25:07 +02:00
Stephan
0babb7f28a deploy-358 - reduce allocations in CancellableEventArgs 2017-08-31 18:03:34 +02:00
Stephan
5ba801386c Merge branch 'dev-v7' into temp-deploy-358 2017-08-31 18:03:19 +02:00
Shannon
57a8df8309 fixes tests 2017-08-31 16:47:52 +10:00
Shannon
342ce7e507 updates user authz logic and adds more tests (and fixes test) 2017-08-31 15:53:15 +10:00
Shannon Deminick
7d227a8cd8 Merge pull request #2161 from umbraco/temp-U4-6929 
U4-6929 User permissions security issue
 2017-08-31 15:11:37 +10:00
Stephan
e83d278b9a deploy-360 - missing file 2017-08-30 13:43:16 +02:00
Mads Rasmussen
ede6664e7f allow admins to edit all groups 2017-08-30 13:27:52 +02:00
Stephan
54c4e3b422 deploy-360 - add IUniqueIdentifyingServiceConnector 2017-08-30 12:17:04 +02:00
Sebastiaan Janssen
cf951e7055 Merge pull request #2107 from leekelleher/temp-U4-10260 
U4-10260 - Umbraco.7.7 beta - NestedContent with ModelsBuilder disabled throws error
 2017-08-30 10:04:24 +02:00
Shannon
e18c91dedc fixing tests 2017-08-30 12:10:02 +10:00
Shannon Deminick
e34e536dad Merge pull request #2156 from umbraco/temp-U4-10326 
Creating a new content node using Content Templates (Blueprints) always places node at root.
 2017-08-30 11:35:47 +10:00
Shannon
209273ba64 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/init.js
#	src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js
 2017-08-30 11:08:36 +10:00
Shannon
8c998fd4e6 Creates a virtual ConfigureUmbracoUserManager in UmbracoDefaultOwinStartup so inheritors can just override that if they want to simplify the startup owin code process 2017-08-30 11:02:58 +10:00
Shannon Deminick
88f332f5c7 Merge pull request #2157 from umbraco/temp-U4-10367 
U4-10367 417 missing token error due to cookie being overwritten
 2017-08-30 10:54:29 +10:00
Sebastiaan Janssen
a1b9842215 Merge pull request #2131 from bjarnef/dev-v7-U4-10281 
U4-10281 - Fix maxchars javascript errors on macro parameter editors
 2017-08-29 11:23:16 +02:00
Sebastiaan Janssen
d300bf8d6d U4-10367 417 missing token error due to cookie being overwritten 
Changes the cookie and header names to be Umbraco specific
 2017-08-29 11:17:52 +02:00
Robert
67489d496a Creating a node using Blueprints now places the node under the parrent that was created 2017-08-29 09:30:22 +02:00
Shannon
78e66ce25f ok, hope this fixes tests 2017-08-29 16:34:30 +10:00
Shannon
dcc0374464 trying to fix unit tests 2017-08-29 15:18:16 +10:00
Shannon
7571dab4cc Updates the user auth helper and adds unit tests for it's scenarios 2017-08-29 15:13:07 +10:00
Shannon
a95afa610f updates unit test config to work with new unit tests 2017-08-29 12:01:32 +10:00
Shannon
13e2112c3c U4-10361 Creating new member when AllowManuallyChangingPassword="false" - can't set a password 2017-08-29 11:56:38 +10:00
Shannon Deminick
cf10f5f0ee Merge pull request #2154 from umbraco/temp-U4-10363 
U4-10363 417 missing token error due to invalid cookie name
 2017-08-29 11:11:35 +10:00
Shannon
ca00246236 another update to perform a little better again (cookies are read VERY often) 2017-08-29 11:10:28 +10:00
Shannon
d71b8a139f Moves GetCookieValue to an extension method, cleans up code, adds unit tests 2017-08-29 10:50:20 +10:00
Sebastiaan Janssen
6bf0d6e175 U4-10363 417 missing token error due to invalid cookie name 
Manually parse the cookie header instead of using the buggy extension method
 2017-08-28 20:36:56 +02:00
Shannon
f37307d540 fixes path access checks to include root ... but now i need to figure out another problem. 2017-08-29 01:16:37 +10:00
Shannon
6995c184e3 Updates user editor, non-admins can see all user groups but cannot edit them, they can save user that contain groups that they don't have access to if they were already there but cannot add new ones they dont' have access to 2017-08-29 01:00:08 +10:00
Stephan
cf450bebc3 Bugfix CombineStartNodes 2017-08-28 15:26:27 +02:00
Shannon
241fbb2144 combine start node tests 2017-08-28 23:06:31 +10:00
Shannon
513aa0b95d Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-28 22:41:14 +10:00
Sebastiaan Janssen
7a0c6ab975 Merge pull request #2135 from umbraco/temp-U4-10301 
U4-10301 Change the PluginManager hash to use more reliable and consi…
 2017-08-28 11:44:40 +02:00
Robert
2ec91a075d Merge pull request #2150 from umbraco/temp-U4-10264 
fixes: U4-10264 Umbraco 7.7 beta - UX - 'Set permission' above 'Close'
 2017-08-28 11:21:16 +02:00
Stephan
49d5005453 Merge pull request #2151 from umbraco/temp-U4-10358 
U4-10358 Upgrade error from 7.1.8 to 7.6.5: The index 'IX_umbracoNode…
 2017-08-26 15:26:41 +02:00