yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,504 Commits 4 Branches 7 Tags
2a15feec4026d0d28a596d0396f6ef923ab7b7ea
Commit Graph

656 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Claus
2fdf148610 localizing text https://github.com/umbraco/Umbraco-CMS/pull/1250 2017-06-26 15:41:17 +02:00
Stephan
e87be7ad9d Fixing tests - and all sorts of issues 2017-06-23 18:58:08 +02: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
Shannon
ea2f808c1e fixes tests 2017-06-23 14:58:00 +10: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
Stephan
4cdb30fed0 Merge branch dev-v7 into dev-v7.7 2017-06-20 14:27:25 +02:00
Shannon
d7e65dd088 User groups can now be created/saved 2017-06-20 15:10:42 +10:00
Shannon
7689ee73d4 Wires up saving the user group 2017-06-20 14:33:24 +10:00
Shannon
af7a5187f2 Adds the user count to IUserGroup 2017-06-20 13:19:14 +10:00
Shannon
0858e04345 tidy up how a user is created when invited, ensure the special empty password is used. 2017-06-15 00:46:23 +02:00
Shannon
51b19bedc8 Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Editors/GravatarController.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
 2017-06-14 22:30:36 +02:00
Mikkel Holck Madsen
da4be3be65 Merge pull request #1995 from umbraco/temp-backofficeguids 
Adds hoverstates for metadata(documenttypes, datatypes etc), making it possible to see their guids in the backoffice
 2017-06-14 08:27:41 +02:00
Shannon
f09f17e496 getting email invite working and with identity apis 2017-06-13 18:38:16 +02:00
Shannon
716629235e issue with mapping ysod 2017-06-13 15:47:39 +02:00
Claus
160518e977 adding guids to backoffice. 2017-06-12 12:12:14 +02:00
Shannon
174e336512 fixes sections 2017-06-06 02:13:14 +02:00
Shannon
9bf61bb487 real data for user group 2017-06-06 02:05:17 +02:00
Shannon
7533b0e704 ensures icons, ensures saving info for creating users 2017-06-06 01:21:03 +02:00
Shannon
f907385ac8 fix mapping issue 2017-06-06 01:06:19 +02:00
Shannon
bbda93a06b updates mapping for start nodes 2017-06-06 00:49:36 +02:00
Shannon
76032cf5f7 maps name and icon for user groups 2017-06-06 00:13:46 +02:00
Shannon
64975166e7 updates user models 2017-06-06 00:02:23 +02:00
Shannon
2ee34d5c48 updates user models 2017-06-05 23:25:33 +02:00
Shannon
7d1aedc0d3 fixes unit tests 2017-06-05 10:17:18 +02:00
Shannon
b99b9b7a6b adds blueprints dictionary to ContentTypeBasic result 2017-06-04 17:31:31 +02:00
Shannon
106a06be2a Gets templates working 2017-05-31 13:09:26 +02:00
Shannon
a70c9226fc Updates lots of trees for searching and gets results grouped 2017-05-31 12:25:05 +02:00
Stephan
7ea9c9c8e2 Move Web.Current to Composing 2017-05-30 18:13:11 +02:00
Stephan
d34a425dd1 porting 7.6@5c5baca into 8 2017-05-30 12:54:22 +02:00
Shannon
3ae16e717c Merge branch 'dev-v7-pluggable-ISearchableTree' of https://github.com/efabioli/Umbraco-CMS into efabioli-dev-v7-pluggable-ISearchableTree 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
 2017-05-30 00:48:41 +02:00
Shannon
6cd52bbc3c Gets user invite generating the token, sending the email and then verifying the token 2017-05-29 15:55:36 +02:00
Shannon
7f27745d27 starting to get the invite email with token working 2017-05-29 09:36:07 +02:00
Shannon
f493c254e8 Fixes up the users login date on the user list view, fixes tests 2017-05-26 12:47:31 +10:00
Shannon
362b98509b Updates path check to use all assigned user start nodes that are combined by their groups and directly assigned values 2017-05-26 12:09:06 +10:00