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
|
4f6ecf5e91
|
Merge branch 'temp-old-client-files-clean-up-2' into dev-v7.7
|
2017-06-28 15:27:34 +02:00 |
|
Claus
|
eb4588780e
|
Hartvig removing a lot of old client files used only in v6.
Reverted on dev-v7 and cherrypicked onto dev-v7.7.
|
2017-06-28 15:01:56 +02:00 |
|
Claus
|
9a4c1972b2
|
Merge pull request #2020 from umbraco/revert-2008-temp-old-client-files-clean-up
Revert "Removing unused v6 images"
|
2017-06-28 14:49:05 +02:00 |
|
Claus
|
b993ce953b
|
Revert "Removing unused v6 images"
|
2017-06-28 14:48:41 +02:00 |
|
Claus
|
dde0f1aa36
|
Merge pull request #2008 from umbraco/temp-old-client-files-clean-up
Removing unused v6 images
|
2017-06-28 13:07:19 +02:00 |
|
Stephan
|
3fd6754057
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2017-06-28 12:46:46 +02:00 |
|
Stephan
|
8fbb459233
|
fix and annotate some tests
|
2017-06-28 12:46:40 +02:00 |
|
Mads Rasmussen
|
de00b2ef00
|
fixes: U4-10061 Add functionality for show/hide/copy password when creating new user
|
2017-06-28 10:29:16 +02:00 |
|
Mads Rasmussen
|
2294940038
|
bring back the avatar in the edit user editor
|
2017-06-27 12:53:41 +02:00 |
|
Shannon
|
e8e2e2c91d
|
Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions
|
2017-06-27 19:55:21 +10:00 |
|
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 |
|
Shannon
|
cb6f934792
|
fixes cache bust value
|
2017-06-27 19:40:24 +10:00 |
|
Mads Rasmussen
|
8eb4d2ed20
|
fixes: U4-10062 Restrict current user permissions
|
2017-06-27 11:40:04 +02:00 |
|
Mads Rasmussen
|
bc19c8358d
|
update to edit user to support state key instead of state alias
|
2017-06-27 11:31:41 +02:00 |
|
Mads Rasmussen
|
439df3b52c
|
user group preview - only show edit button if edit is allowed
|
2017-06-27 10:07:16 +02:00 |
|
Shannon
|
ab71fa3101
|
adds the IsCurrentUser flag to the UserDisplay model
|
2017-06-27 15:44:55 +10:00 |
|
Shannon
|
8e21bc3c74
|
Create user now generates a password
|
2017-06-27 15:30:32 +10:00 |
|
Shannon Deminick
|
7adbecf9a1
|
Merge pull request #2019 from lars-erik/U4-6695-internalsvisibleto-unittesting-adapter
U4-6695 Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter")
|
2017-06-27 10:06:36 +10:00 |
|
Claus
|
2fdf148610
|
localizing text https://github.com/umbraco/Umbraco-CMS/pull/1250
|
2017-06-26 15:41:17 +02:00 |
|
Claus
|
9d9e5e8274
|
Merge branch 'rodyvansambeek-patch-1' into dev-v7
|
2017-06-26 15:33:27 +02:00 |
|
Claus
|
89895dd592
|
Merge branch 'patch-1' of git://github.com/rodyvansambeek/Umbraco-CMS into rodyvansambeek-patch-1
# Conflicts:
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
|
2017-06-26 15:32:47 +02:00 |
|
Mads Rasmussen
|
f309e3587b
|
fix user group filter + add UI for user states filter
|
2017-06-26 15:00:32 +02:00 |
|
Lars-Erik Aabech
|
f9252372ea
|
Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter") for more imperative exposure to custom unit test adapters.
|
2017-06-26 12:39:57 +02:00 |
|
Claus
|
02a2178029
|
Merge branch 'benjaminketron-temp-U4-9464' into dev-v7
|
2017-06-26 11:33:27 +02:00 |
|
Claus
|
ee775a2fde
|
adding a few more tests.
|
2017-06-26 11:31:46 +02:00 |
|
Claus
|
22af206626
|
Merge branch 'temp-U4-9464' of git://github.com/benjaminketron/Umbraco-CMS into benjaminketron-temp-U4-9464
|
2017-06-26 11:23:24 +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 |
|
AndyButland
|
67e109c0e6
|
Preserved line breaks in property descriptions when rendering in content area
|
2017-06-23 11:40:43 +02:00 |
|
Sebastiaan Janssen
|
8a4d85771b
|
Merge pull request #2016 from mikecp/U4-10047
U4 10047
|
2017-06-23 11:14:49 +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 |
|
Sebastiaan Janssen
|
4688ac104e
|
Merge pull request #1494 from AndyButland/u4-8999
U4-8999 - health check, debug compilation mode is being reported in error when config missing
|
2017-06-23 08:31:29 +02: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
|
ea2f808c1e
|
fixes tests
|
2017-06-23 14:58:00 +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 |
|
Shannon
|
25a79bc2fa
|
fixing tests
|
2017-06-23 11:43:58 +10:00 |
|
Shannon
|
8cd413ba8f
|
ensures group start nodes are set to null on install
|
2017-06-23 11:24:06 +10:00 |
|
Shannon
|
1eeae770b4
|
Fixes issue with calculating all user start nodes, improves perf too
|
2017-06-23 11:23:40 +10:00 |
|
Michael Latouche
|
032dbe5bf5
|
Update fr.xml
|
2017-06-23 00:52:10 +02:00 |
|
Michael Latouche
|
a7695163b9
|
Update fr.xml
|
2017-06-23 00:21:33 +02:00 |
|
Michael Latouche
|
cb4569677e
|
Update fr.xml
|
2017-06-23 00:10:22 +02:00 |
|
Michael Latouche
|
4be704b968
|
Update fr.xml
|
2017-06-23 00:09:52 +02:00 |
|
Michael Latouche
|
b7a5cb046a
|
Update fr.xml
|
2017-06-22 23:56:33 +02:00 |
|