swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,430 Commits 73 Branches 219 Tags
44bb7e84dbf2da94de4267e5b6e4c911839c51a3
Commit Graph

6083 Commits

Author SHA1 Message Date
Claus 6a06a9e400 small tweak to skip a check if not needed. 2017-07-10 15:27:15 +02:00
Claus 1149129c6f U4-10104 Dashboards are not showing up in backoffice 2017-07-10 15:21:24 +02:00
Claus ad886efa62 cleanup and lineendings. 2017-07-10 15:20:17 +02:00
Claus c0a6c58a07 U4-10134 Disabled doesn't override Invited 2017-07-10 13:38:39 +02:00
Claus f2b52585e1 U4-10111 Changing email on a user doesn't show the username field 2017-07-10 12:22:35 +02:00
Claus 7540f49a5e fixing a bunch of mismatching mappings. 
aligning property names with what they actually are.
 2017-07-06 14:41:05 +02:00
Claus 2e29d112e5 reformatting. 2017-07-06 13:14:24 +02:00
Claus 271056f997 mapping media start nodes instead of mapping content twice. 2017-07-06 12:48:47 +02:00
Shannon 403a210c1c Fixes issue with assigning default permissions for a new user group 2017-07-05 19:25:48 +10:00
Shannon 03c7429653 FIxes SQL statement when upgrading with SQLCE and fixes GetAll when passing in an array of ints to ensure that we check if the int array is empty or not 2017-07-05 18:23:51 +10:00
Shannon 1d9e33dadf Granular permissions in group editor are all working, we could do with an edit button but for now it's ok, selecting the same node will perform an 'edit' 2017-07-04 15:40:33 +10:00
Shannon 316ec5d20f gets granular permissions showing correctly in group editor 2017-07-04 15:07:11 +10:00
Shannon 82bd11e66d Gets filtering on user state working 2017-07-03 19:27:48 +10:00
Shannon ff02b28d26 Fixes tree for single tree sections, fixes creating a user group so you can select default permissions 2017-07-03 16:31:47 +10:00
Shannon 224d1bcf6e U4-10053 Review anywhere else in the codebase that may reference User Type 
and removes all old editors, trees, etc...
 2017-06-30 18:38:02 +10:00
Shannon e4edd8f692 U4-10053 Review anywhere else in the codebase that may reference User Type 
This also removes some totally unused and ancient code
 2017-06-30 18:14:44 +10:00
Shannon 804c60653e Merge branch 'dev-v7.7' into user-group-permissions 
# Conflicts:
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
 2017-06-30 16:57:22 +10:00
Shannon 29c6d547db Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-06-30 16:55:04 +10:00
Shannon 546999e470 U4-9946 Update the ExternalSignInAutoLinkOptions to support groups - currently still using UserType 2017-06-30 16:50:44 +10:00
Shannon 0da75f4e78 Updates content permissions dialog to show the explicit permissions assigned and removing them will reset them. 2017-06-30 16:32:01 +10:00
Shannon a072d4edb3 adds security to changing premissions in the content dialog 2017-06-30 14:42:08 +10:00
Claus 9edbb3fc26 Merge pull request #1634 from soreng/patch-2 
use already defined variable, instead of mapping the path twice
 2017-06-29 14:47:21 +02:00
Claus d6bae1b58f Merge pull request #1958 from poornimanayar/U4-9661 
U4-9661 Remove "move" button in member section
 2017-06-29 14:37:00 +02:00
Claus ef53db52f7 Merge pull request #1850 from pijemcolu/temp-U4-9710 
U4-9710 ImageCropDataSet.HasImage returns wrong value
 2017-06-29 14:07:59 +02:00
Shannon 4f28cb1917 Gets content permissions saving per user group 2017-06-29 19:15:04 +10:00
Claus da8c0726b1 Merge branch 'U4-5454' of git://github.com/trt/Umbraco-CMS into temp-U4-5454 2017-06-29 08:59:45 +02:00
Claus de6ffd456c Merge pull request #1972 from wanddy/dev-v7-chnfixnew 
Fix translation didn't work in some tree node
 2017-06-29 08:47:37 +02:00
Shannon 5dec4a4a94 Moves logic to separate UserGroupsController from the user controller, refactors a few model mappings to reduce a few lines of code, default permissions on user groups now save 2017-06-29 14:39:11 +10:00
Shannon 454684e108 updates user models to not return so much info when not needed 2017-06-29 13:13:32 +10:00
Shannon 4fc5279a78 ok, tests fixed now? 2017-06-29 12:38:33 +10:00
Shannon 7ca7b6f922 Allows for the mini profiler in the back office (again) 2017-06-29 01:04:20 +10:00
Shannon 85d988e75e Adds GetDetailedPermissions to the content controller which is used in the permissions dialog 2017-06-29 01:00:52 +10:00
Shannon 8023a89b10 Returns the default permissions as a model as part of the UserGroupDisplay and wires this up in the user group editor 2017-06-28 23:38:42 +10:00
Shannon d78dcb51c0 Gets the invite fully working along with choosing an avatar, adds more security so that the link can't be used again, 2017-06-27 19:55:03 +10:00
Shannon cb6f934792 fixes cache bust value 2017-06-27 19:40:24 +10:00
Shannon ab71fa3101 adds the IsCurrentUser flag to the UserDisplay model 2017-06-27 15:44:55 +10:00
Shannon 8e21bc3c74 Create user now generates a password 2017-06-27 15:30:32 +10:00
Shannon Deminick 7adbecf9a1 Merge pull request #2019 from lars-erik/U4-6695-internalsvisibleto-unittesting-adapter 
U4-6695 Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter")
 2017-06-27 10:06:36 +10:00
Claus 2fdf148610 localizing text https://github.com/umbraco/Umbraco-CMS/pull/1250 2017-06-26 15:41:17 +02:00
Lars-Erik Aabech f9252372ea Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter") for more imperative exposure to custom unit test adapters. 2017-06-26 12:39:57 +02:00
Shannon 0cd871241f Gets password reset working, gets more server side validation wired up 2017-06-23 16:38:39 +10:00
Shannon 3eba5e5c19 Merge branch 'dev-v7.7' into user-group-permissions 
# Conflicts:
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Tests/Services/UserServiceTests.cs
#	src/Umbraco.Web.UI.Client/src/common/services/util.service.js
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-06-23 16:37:56 +10:00
Sebastiaan Janssen 4688ac104e Merge pull request #1494 from AndyButland/u4-8999 
U4-8999 - health check, debug compilation mode is being reported in error when config missing
 2017-06-23 08:31:29 +02:00
Shannon 754dbc9621 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
 2017-06-23 15:15:55 +10:00
Shannon ea2f808c1e fixes tests 2017-06-23 14:58:00 +10:00
Shannon 3ece9175a0 Moves the enable/disable user notifications and localization alerts to server side, adds server side validation so that the current user cannot disable themsevlves. 2017-06-23 14:49:04 +10:00
Shannon 692dc66684 You can now change the user password in the user editor 2017-06-23 14:08:58 +10:00
Shannon 1eeae770b4 Fixes issue with calculating all user start nodes, improves perf too 2017-06-23 11:23:40 +10:00
Sebastiaan Janssen af382c171b Merge pull request #2009 from umbraco/temp-U4-10034 
U4-10034 Package install may not wait for app domain restart in all cases
 2017-06-22 11:22:18 +02:00
Shannon b43ca64ac7 Ensures that the auth cookie data contains all of the user's start nodes, fixes persisting the user group icon 2017-06-22 16:32:44 +10:00