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

4878 Commits

Author SHA1 Message Date
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
Mads Rasmussen
f309e3587b fix user group filter + add UI for user states filter 2017-06-26 15:00:32 +02:00
Mads Rasmussen
493873a8d0 permissions dialog: add edit button to selected user group 2017-06-25 22:48:49 +02:00
Mads Rasmussen
7beec02a3f permissions dialog: fix save button text 2017-06-25 21:54:32 +02:00
Mads Rasmussen
86cb750ca1 permissions dialog: filter out selected groups from dropdown 2017-06-25 21:51:17 +02:00
Mads Rasmussen
f92e119060 hardcode group names 2017-06-25 20:27:14 +02:00
Mads Rasmussen
13a0621f89 localize strings 2017-06-25 20:26:44 +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
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
d936105cfe Gets the user states set correctly 2017-06-23 15:14:46 +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
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
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
Claus
54fdfdd639 adding grunt watch interval to prevent insane cpu load. 2017-06-22 11:05:42 +02: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
Claus
0eb8ebd82e fixing up translations. 2017-06-21 14:04:15 +02:00
Claus
bc76fa8687 Merge branch 'localization-v764' of git://github.com/abryukhov/Umbraco-CMS into temp-U4-10043 2017-06-21 12:03:25 +02:00
Mads Rasmussen
bd7aba5ea2 fix umb-toggle labels + add documentation 2017-06-21 11:35:53 +02:00
Shannon
6d81705ece fixes the restart check 2017-06-21 18:34:22 +10:00
Shannon
2f24dfb8f0 changes name from versionHash to cacheBuster 
(cherry picked from commit 439c30e2fd)
 2017-06-21 08:26:44 +02:00
Shannon
ad63050078 Fixes issue of rendering the umb version in the html markup 
(cherry picked from commit c13b2fae4b)
 2017-06-21 08:26:20 +02:00
Alexander Bryukhov
552c2ed4dc Localizing hardcoded strings 2017-06-21 02:45:18 +07:00
Alexander Bryukhov
d7e522132e Localizing hardcoded strings 2017-06-21 02:45:12 +07:00
Alexander Bryukhov
ca7c43d944 Localizing hardcoded strings 2017-06-21 02:45:05 +07:00
Alexander Bryukhov
c35e842391 Localizing hardcoded strings 2017-06-21 02:44:59 +07:00
Alexander Bryukhov
dae20cc986 Localizing hardcoded strings 2017-06-21 02:44:52 +07:00
Alexander Bryukhov
c466514e7f Localizing hardcoded strings 2017-06-21 02:44:45 +07:00
Alexander Bryukhov
5e2aa7fa68 Localizing hardcoded strings 2017-06-21 02:44:39 +07:00
Alexander Bryukhov
11ccc88bc8 Localizing hardcoded strings 2017-06-21 02:44:33 +07:00
Alexander Bryukhov
c83009c879 Localizing hardcoded strings 2017-06-21 02:44:26 +07:00
Alexander Bryukhov
d6b9b41776 Localizing hardcoded strings 2017-06-21 02:44:19 +07:00
Alexander Bryukhov
508a4c32b4 Localizing hardcoded strings 2017-06-21 02:44:12 +07:00
Alexander Bryukhov
dbf2538aae Localizing hardcoded strings 2017-06-21 02:44:06 +07:00
Alexander Bryukhov
5293b3bcc7 Localizing hardcoded strings 2017-06-21 02:44:00 +07:00
Alexander Bryukhov
940caba2c4 Localizing hardcoded strings 2017-06-21 02:43:53 +07:00
Alexander Bryukhov
e31daef4fa Localizing hardcoded strings 2017-06-21 02:43:47 +07:00
Alexander Bryukhov
7984626433 Localizing hardcoded strings 2017-06-21 02:43:40 +07:00
Alexander Bryukhov
ffa557b097 Localizing hardcoded strings 2017-06-21 02:43:33 +07:00
Alexander Bryukhov
9236bcbcd8 Localizing hardcoded strings 2017-06-21 02:43:26 +07:00
Alexander Bryukhov
1b875b0c67 Localizing hardcoded strings 2017-06-21 02:43:19 +07:00
Alexander Bryukhov
ecce68da0a Localizing hardcoded strings 2017-06-21 02:43:12 +07:00
Alexander Bryukhov
e27a882d2b Localizing hardcoded strings 2017-06-21 02:43:06 +07:00