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

20888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
ed78082693 aligning UI for pickers 2017-06-29 10:15:10 +02:00
Claus
f0f25c67c6 refactoring method signatures to prevent breaking changes. 2017-06-29 10:00:16 +02:00
Mads Rasmussen
91e15d4b64 use userGroupsResource in users and groups overview 2017-06-29 09:57:24 +02:00
Claus
da8c0726b1 Merge branch 'U4-5454' of git://github.com/trt/Umbraco-CMS into temp-U4-5454 2017-06-29 08:59:45 +02:00
Claus
2fbb9721fa updating language files. 2017-06-29 08:53:22 +02:00
Claus
de6ffd456c Merge pull request #1972 from wanddy/dev-v7-chnfixnew 
Fix translation didn't work in some tree node
 2017-06-29 08:47:37 +02:00
Claus
5b3ff58ad8 Merge pull request #1964 from esn303/patch-2 
Update "Element hinzufügen" (Add grid element)
 2017-06-29 08:14:08 +02:00
Shannon
5dec4a4a94 Moves logic to separate UserGroupsController from the user controller, refactors a few model mappings to reduce a few lines of code, default permissions on user groups now save 2017-06-29 14:39:11 +10:00
Shannon
5d5b852e5a moves the change password part of the user to where the design had it 2017-06-29 13:17:19 +10:00
Shannon
454684e108 updates user models to not return so much info when not needed 2017-06-29 13:13:32 +10:00
Shannon
4fc5279a78 ok, tests fixed now? 2017-06-29 12:38:33 +10:00
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
Stephan
71b5e5223f U4-10006 - fix 2017-06-28 16:26:27 +02: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
Stephan
f3935b5007 Merge branch 'dev-v7' into temp-u4-10006 2017-06-28 13:10:05 +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