Commit Graph

19673 Commits

Author SHA1 Message Date
Stephan
3ac64f18d2 Bugfix UserModelMapper 2017-07-17 15:08:45 +02:00
Shannon
193682cd4c Ability to select the root node for the users start node 2017-07-17 20:09:00 +10:00
Shannon
d99f7b6ff6 Ability to select the root node for the users start node 2017-07-17 19:51:51 +10:00
Shannon
d1d74203ea Ability to select root node in user group picker so the user group can explicitly allow root access or not. 2017-07-17 19:40:45 +10:00
Warren Buckley
4d0a2c85b7 Merge pull request #2049 from umbraco/temp-U4-5672
U4-5672 Properties and Tabs moving/incorrect when Enable list view se…
2017-07-17 09:41:37 +01:00
Shannon
e135291980 Fixes issue with user group start nodes, they are allowed to have null and by default this will be the case but we couldn't remove them and the ROOT node wasn't being mapped. 2017-07-17 18:23:20 +10:00
Sebastiaan Janssen
e1957b895f U4-5672 Properties and Tabs moving/incorrect when Enable list view selected 2017-07-17 09:46:30 +02:00
Stephan
04daaef7b7 Merge branch 'user-group-permissions' into temp-U4-10075 2017-07-14 20:15:51 +02:00
Stephan
29aaa26022 U4-10023 - fix media picker for multiple start nodes 2017-07-14 20:13:57 +02:00
Shannon Deminick
3f6ec6e36f Merge pull request #2045 from umbraco/temp-U4-10106
U4-10106 Cannot delete user groups
2017-07-14 10:53:27 +10:00
Shannon
8347d8f23b Merge remote-tracking branch 'origin/user-group-permissions' into temp-U4-10106
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
2017-07-14 10:53:07 +10:00
Shannon
db863a4592 update sln to stop building the damn UI project 2017-07-14 10:49:10 +10:00
Shannon
ca104347b3 Merge branch 'user-group-permissions' into temp-U4-10106 2017-07-14 10:43:45 +10:00
Shannon
9fbf1aedac adds both post and delete verbs 2017-07-14 10:43:12 +10:00
Shannon Deminick
dfbd064de6 Merge pull request #2044 from umbraco/temp-U4-10096
U4-10096 Ability to bulk assign users to groups in the user list
2017-07-14 10:35:49 +10:00
Stephan
c696c62185 More fsTreeController cleanup 2017-07-13 15:12:14 +02:00
Warren Buckley
0dfbb95033 Merge branch 'madjor5-U4-4413_-_maxlength' into dev-v7 2017-07-13 13:39:20 +01:00
Stephan
2bff1bfbb6 U4-10121 - properly dispose context 2017-07-13 14:20:29 +02:00
Warren Buckley
17969e4537 Merge branch 'U4-4413_-_maxlength' of https://github.com/madjor5/Umbraco-CMS into madjor5-U4-4413_-_maxlength
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
2017-07-13 13:09:06 +01:00
Stephan
ab1dade468 U4-10121 - properly dispose context 2017-07-13 13:11:46 +02:00
mikkelhm
374fdcf29e Bumps version to 7.6.5 2017-07-13 12:14:32 +02:00
Shannon
1643eec62c Fixes cache refreshing for user groups since user cache need to be cleared for that too. Updates cache refreshers to use json.net for serializing which is way faster. adds better support for querying multiple user groups and entity ids for permissions, updates tests 2017-07-13 18:47:10 +10:00
Claus
6a48c1646d checking for uses of userType. 2017-07-13 09:26:48 +02:00
Shannon
6e89202002 Fixes usages of IUserService.GetPermission since before it was doing a FirstOrDefault() since that's just how the old APIs worked, now we need to get all permissions based on groups. Also updated the usages of ToString for char for the permissions to be culture invariant everywhere. 2017-07-13 14:32:43 +10:00
Shannon
69a6a80ffd Updates logic and test for getting all node permissions for a user that have explicit permissions defined 2017-07-13 14:16:13 +10:00
Shannon
c472463f37 Removes all user permissions cache refreshing and events and obsoletes assocated clsses 2017-07-13 11:02:34 +10:00
Shannon
76f9e2c22a Updates user permissions lookup to do one query instead of one query per user group 2017-07-13 10:43:42 +10:00
Shannon
df18cdc7f7 Merge remote-tracking branch 'origin/user-group-permissions' into temp-U4-10075 2017-07-13 01:58:18 +10:00
Shannon
87dcdc596e Gets last unit tests written for returning all permissions for either user or group when not specifying Ids 2017-07-13 01:56:22 +10:00
Shannon
044120ffd2 Gets inherited permissions working, adds lots of unit tests, few more tests to write now. 2017-07-13 00:07:51 +10:00
Claus
bcb19eea35 Merge pull request #1678 from PeteDuncanson/patch-2
Fixed error label showing when you do a retry
2017-07-12 15:47:32 +02:00
Claus
0acb0d48a1 Merge pull request #1858 from Jeavon/RelatedLinks-Tweaks
Tweaks to RelatedLinks
2017-07-12 15:26:53 +02:00
Claus
da00ad1444 Merge branch 'abryukhov-temp-U4-10139' into dev-v7 2017-07-12 15:10:51 +02:00
Claus
7bc52b3948 localization fixes. 2017-07-12 15:06:29 +02:00
Claus
a77aec4156 Merge branch 'temp-U4-10139' of git://github.com/abryukhov/Umbraco-CMS into abryukhov-temp-U4-10139 2017-07-12 14:36:47 +02:00
Claus
f7f3dccfc8 Merge pull request #2042 from umbraco/temp-fsTreeController
filesystem controller compatibility
2017-07-12 14:27:00 +02:00
Claus
ab3469d703 cleanup. 2017-07-12 14:26:44 +02:00
Claus
c78ea90cf5 cleaning up a bit. 2017-07-12 14:24:09 +02:00
Claus
c8828b968c found an extension method :) 2017-07-12 13:56:18 +02:00
Claus
2e28ff3ccf U4-10106 Cannot delete user groups 2017-07-12 13:43:00 +02:00
Sebastiaan Janssen
3de0b85ae3 Merge pull request #2001 from umbraco/temp-u4-9993
U4-9993 - fix upgrade issues
2017-07-12 12:59:19 +02:00
Stephan
f18b7110c9 Minor fix in DataTypeValidateAttribute 2017-07-12 12:26:51 +02:00
Claus
44bb7e84db U4-10142 Adding a user - does not show up until refresh 2017-07-12 11:52:08 +02:00
Claus
06f68b1417 U4-10096 Ability to bulk assign users to groups in the user list 2017-07-12 11:31:34 +02:00
Shannon
7115d85440 Removes unused and unneeded APIs on IUserService, updates code comments to describe implicit vs explicit permissions 2017-07-12 14:06:30 +10:00
Shannon
d9937fb276 Stop trying to build the UI.Client project as part of the sln build 2017-07-12 14:01:36 +10:00
Stephan
87b51d1418 Merge branch dev-v7 into temp-fsTreeController 2017-07-11 19:06:01 +02:00
John Kilmister
8ea1af56ab U4-10143 - Improved error messages when we retrieve current xml node 2017-07-11 16:22:21 +01:00
Stephan
219eb61194 Merge branch 'dev-v7' into temp-u4-9993 2017-07-11 14:47:54 +02:00
Claus
7f98f99eaa Merge pull request #2039 from umbraco/temp-u4-10121
U4-10121 - Scheduled Publishing as background task
2017-07-11 11:37:46 +02:00