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

19109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
1eeae770b4 Fixes issue with calculating all user start nodes, improves perf too 2017-06-23 11:23:40 +10:00
Mads Rasmussen
0e2c94c079 fix remove user from user group 2017-06-22 14:59:03 +02:00
Mads Rasmussen
99da2e923d move toggle to the left of the permission text 2017-06-22 13:30:36 +02:00
Mads Rasmussen
c9200d54b5 update umb-toggle to show icons as default instead of labels 2017-06-22 13:28:01 +02:00
Shannon
8f51f574ae fixing build 2017-06-22 17:02:46 +10:00
Shannon
90d4153e87 updates some of the sub view routing with users/groups so the routing is always there 2017-06-22 16:47:45 +10:00
Shannon
6380d1d538 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-22 16:33: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
Mads Rasmussen
7825040e4d sync tree 2017-06-21 15:55:57 +02:00
Mads Rasmussen
f27b456eb4 users overview tlc + cleanup. Changed click to open instead of select 2017-06-21 15:40:52 +02:00
Mads Rasmussen
bd7aba5ea2 fix umb-toggle labels + add documentation 2017-06-21 11:35:53 +02:00
Mads Rasmussen
9786ae8428 wip content permissions dialog 2017-06-20 15:35:02 +02:00
Mads Rasmussen
f28c4cdaa5 load new permissions dialog 2017-06-20 15:19:42 +02:00
Mads Rasmussen
cc41447ff7 prototype default permissions on edit user group 2017-06-20 15:19:06 +02:00
Mads Rasmussen
2e239939fc add umb-toggle component 2017-06-20 14:52:32 +02:00
Shannon
9dc34f0c98 Updating a bunch of start node checking logic to ensure that it takes the user and user group start nodes into account 2017-06-20 18:38:31 +10:00
Shannon
cec829774e Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
 2017-06-20 17:09:52 +10:00
Shannon
94e958bd7a Ensures the user's combined start nodes are used when checking path access 2017-06-20 17:04:00 +10:00
Shannon Deminick
42d7c83a6d Merge pull request #2004 from umbraco/temp-u4-10026 
U4-10026 - use id-key map for getting by guid
 2017-06-20 17:01:35 +10:00
Stephan
1a435148d8 U4-10026 - inject idkmap 2017-06-20 08:55:08 +02:00
Shannon
957c8e917f fixes tests 2017-06-20 16:49:24 +10:00
Stephan
de348a9946 Merge remote-tracking branch 'origin/dev-v7' into temp-u4-10026 2017-06-20 08:41:04 +02:00
Shannon
d7e65dd088 User groups can now be created/saved 2017-06-20 15:10:42 +10:00
Shannon
4e1e2c5332 fix unit tests 2017-06-20 14:37:49 +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
e276c7a1bf Wires up getUserGroupScaffold 2017-06-20 12:34:33 +10:00
Shannon
7797ad4130 localizes invite email 2017-06-20 12:25:27 +10:00
Shannon
78bfc087fb Fixes up all of the user sorting to work properly 2017-06-20 11:55:21 +10:00
Shannon
146a865882 fixes UserState values to be what they were before 2017-06-20 11:21:31 +10:00
Shannon Deminick
2654f9189f Merge pull request #1973 from marcemarc/marcemarc-u4-9480 
Revised fix for issue: U4-9489 - Just fix logResource.js parameters
 2017-06-19 20:33:37 +10:00
Mads Rasmussen
79e9394b62 wire up enable users and disable users bulk actions 2017-06-19 11:51:38 +02:00
Shannon
054fd46555 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-19 18:45:53 +10:00
Shannon
9ab9007821 SQL fix for SQLCE for user states 2017-06-19 18:45:38 +10:00
Mads Rasmussen
a7a7909a25 fix header icon width 2017-06-19 10:21:21 +02:00
Sebastiaan Janssen
d7453b5a6e Updating the CG link so we can modify it without releasing a new version 
Updated links to our/tv to be https
 2017-06-19 09:49:15 +02:00
Sebastiaan Janssen
5ed8ceb85e Merge pull request #2000 from umbraco/updates-installer-764 
Update installer photo + tlc on starter kit install screen
 2017-06-19 09:34:40 +02:00
Mikkel Holck Madsen
b7ea0840a9 Merge pull request #2007 from abryukhov/patch-6 
Update ru.xml UI resources
 2017-06-19 09:29:45 +02:00
Shannon Deminick
6b65f1c197 Merge pull request #1970 from Sam7/dev-v7 
U4-9973 Remove sealed modifier from ExternalSignInAutoLinkOptions class
 2017-06-19 17:27:24 +10:00
Alexander Bryukhov
bc7dc8629e Update ru.xml UI resources 
Couple of translation corrections
 2017-06-18 18:35:48 +07:00
Mads Rasmussen
41ee187637 increase font small for small buttons 2017-06-16 14:14:05 +02:00
Mads Rasmussen
3ec9c9a348 fix animation on block buttons 2017-06-16 14:13:44 +02:00
Stephan
464711d3c8 U4-10026 - use id-key map for getting by guid 2017-06-16 14:09:20 +02:00
Mads Rasmussen
efaa24fb51 add UI feedback when enabling/disabling user 2017-06-16 14:03:06 +02:00
Mads Rasmussen
00659711d9 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-15 20:28:39 +02:00
Shannon
021e083b75 Fixes issue with email confirmation date, adds invite date, adds user state counts 2017-06-15 16:47:51 +02:00
Shannon
0f89b1dea7 Fixes up how formctrl are required for various directives, adds validation to invite/create user, fixes up back end and is all now working 2017-06-15 15:59:29 +02:00
Mikkel Holck Madsen
b15fd4496a Merge pull request #1699 from richarth/patch-2 
Spelling and Grammar changes
 2017-06-15 15:24:56 +02:00
Mikkel Holck Madsen
b3ea0c83f9 Merge pull request #1832 from leekelleher/issue/U4-8098 
Fixes U4-8900 - XPath: "$current" on Multinodetreepicker gives error in Document Type editor
 2017-06-15 15:02:14 +02:00
Shannon Deminick
c1aefe0686 Merge pull request #2002 from rmorrin/obsolete-namespace-errors 
Fix incorrect namespace in deprecated class messages
 2017-06-15 14:16:30 +02:00