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 |
|
Alexander Bryukhov
|
c7ae379fd1
|
Localizing hardcoded strings
|
2017-06-21 02:42:59 +07:00 |
|
Alexander Bryukhov
|
8ad13f6853
|
Localizing hardcoded strings
|
2017-06-21 02:42:52 +07:00 |
|
Alexander Bryukhov
|
e4ae40c2fe
|
Localizing hardcoded strings
|
2017-06-21 02:42:45 +07:00 |
|
Alexander Bryukhov
|
be61270e42
|
Localizing hardcoded strings
|
2017-06-21 02:42:38 +07:00 |
|
Alexander Bryukhov
|
bd00b532eb
|
Localizing hardcoded strings
|
2017-06-21 02:42:32 +07:00 |
|
Alexander Bryukhov
|
ebc9478f2d
|
Localizing hardcoded strings
|
2017-06-21 02:42:25 +07:00 |
|
Alexander Bryukhov
|
ab72808a10
|
Localizing hardcoded strings
|
2017-06-21 02:42:18 +07:00 |
|
Alexander Bryukhov
|
068e82172a
|
Localizing hardcoded strings
|
2017-06-21 02:42:10 +07:00 |
|