yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,127 Commits 4 Branches 7 Tags
6ea92daa70cc834cc8e33409f5f404794de025b9
Commit Graph

20127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
abb393c335 fixes tests 2017-06-29 12:31:23 +10:00
Mads Rasmussen
225cf8f8f5 fix content permissions dialog 2017-06-28 22:11:02 +02:00
Mads Rasmussen
0bc2e93230 fix grunt build 2017-06-28 21:52:33 +02:00
Shannon
7ca7b6f922 Allows for the mini profiler in the back office (again) 2017-06-29 01:04:20 +10:00
Shannon
923ceadd02 fixes new permissions model mapping on dialog 2017-06-29 01:03:27 +10:00
Shannon
c5111f9ba8 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/content/rights.html
 2017-06-29 01:01:54 +10:00
Shannon
85d988e75e Adds GetDetailedPermissions to the content controller which is used in the permissions dialog 2017-06-29 01:00:52 +10:00
Mads Rasmussen
49f2892ff1 group.controller.js: a bit of clean up 2017-06-28 16:12:58 +02:00
Mads Rasmussen
c7c0793a0a fix line indention 2017-06-28 16:06:54 +02:00
Mads Rasmussen
3d847b0ea9 fixes: U4-10054 Prototype granular permissions on user group 2017-06-28 16:03:33 +02:00
Shannon
3cd39fee94 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-28 23:38:51 +10:00
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
Per Ploug
e35a748c92 Fixes issues with missing angular modules and adds sourcemap support 2017-06-27 17:00:00 +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
Jeavon
ce38320c6a Tidy up usings 2017-06-27 09:58:12 +01: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
Jeavon
3083f185d0 Merge branch 'dev-v7.7' into temp-U4-9984 2017-06-26 18:01:57 +01:00
Jeavon
07356db30e Adding MachineName to Slack Notification username so you tell where it came from in different environments 2017-06-26 16:34:38 +01:00
Jeavon
f615125c24 Remove Slack options from HealthCheckResults as it now looks after itself 2017-06-26 16:28:44 +01:00
Jeavon
29da5ed843 Fix HttpsCheck to use HealthCheckContext instead of HttpContext so it works with scheduled checks 2017-06-26 16:26:18 +01:00
Jeavon
587ce8fc4f My "and" as in the wrong place 2017-06-26 16:05:15 +01:00
Jeavon
833c787414 Adding message text with totals 2017-06-26 15:53:15 +01:00
Jeavon
1f2e1e4e93 Warnings are success with Warning so should be counted as success 2017-06-26 15:48:44 +01:00
Jeavon
d7bd711d9a Switch Health Check Slack notification to use Slack Attachments 2017-06-26 15:25:11 +01: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