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

5042 Commits

Author SHA1 Message Date
Bjarne Fyrstenborg
dd041a6f09 Ensure it override injected styles from custom font icon 2017-07-07 19:16:42 +02:00
Bjarne Fyrstenborg
733aab6eb5 Fix vertical separator color and height of icon in custom section 2017-07-07 18:57:57 +02:00
mikkelhm
4d316cf0ce Reverts the change for the installer screen which needs to be ready for the new starterkit and Lessons 2017-07-06 15:06:55 +02:00
Claus
7540f49a5e fixing a bunch of mismatching mappings. 
aligning property names with what they actually are.
 2017-07-06 14:41:05 +02:00
Claus
fe451154d1 fixing some markup errors 2017-07-06 13:14:17 +02:00
Shannon
f355b27d1f Merge branch 'dev-v7.7' into user-group-permissions 2017-07-06 12:56:17 +10:00
Shannon
a050a73c31 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-07-06 12:28:51 +10:00
Shannon
bba7b15125 Fixes installer angular module loading - this would have never worked without errors, not sure how we've missed this. 2017-07-05 18:22:45 +10:00
Shannon
1d9e33dadf Granular permissions in group editor are all working, we could do with an edit button but for now it's ok, selecting the same node will perform an 'edit' 2017-07-04 15:40:33 +10:00
Shannon
316ec5d20f gets granular permissions showing correctly in group editor 2017-07-04 15:07:11 +10:00
Robert
7053c175f8 Removed "remove paragraph tags" field 2017-07-03 13:44:37 +02:00
Shannon
82bd11e66d Gets filtering on user state working 2017-07-03 19:27:48 +10:00
Mads Rasmussen
bcffc37287 revert this for now 2017-06-30 21:29:24 +02:00
Mads Rasmussen
8d2a9d1d81 fixes: U4-10060 Make UI for user groups overview 2017-06-30 13:33:59 +02:00
Mads Rasmussen
2aaf104856 change text on cancel button to close 2017-06-30 10:51:23 +02:00
Claus
44cfe5da84 missing nullcheck. 2017-06-30 10:46:44 +02:00
Mads Rasmussen
6ebacf118e fix grunt build 2017-06-30 10:36:55 +02:00
Claus
d5fd266b19 missing semicolon. 2017-06-30 10:34:58 +02:00
Shannon
e4edd8f692 U4-10053 Review anywhere else in the codebase that may reference User Type 
This also removes some totally unused and ancient code
 2017-06-30 18:14:44 +10:00
Shannon
804c60653e Merge branch 'dev-v7.7' into user-group-permissions 
# Conflicts:
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
 2017-06-30 16:57:22 +10:00
Shannon
29c6d547db Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-06-30 16:55:04 +10:00
Shannon
0da75f4e78 Updates content permissions dialog to show the explicit permissions assigned and removing them will reset them. 2017-06-30 16:32:01 +10:00
Mads Rasmussen
968f93f769 stop toggles from closing the dialogs 2017-06-29 15:28:38 +02:00
Mads Rasmussen
0c6c3f6d51 add notifications to content permissions dialog 2017-06-29 15:12:12 +02:00
Mads Rasmussen
81aae79b42 Merge pull request #2015 from umbraco/temp-U4-9839 
U4-9839 Media Picker: If I only upload one photo then select it as a …
 2017-06-29 14:54:49 +02:00
Claus
7fdd2bcdfc Merge pull request #2018 from AndyButland/u4-4090 
Fixes U4-4090 - by preserved line breaks in property descriptions...
 2017-06-29 14:43:13 +02:00
Claus
ba90fdeb56 Merge pull request #1778 from bjarnef/dev-v7-U4-9585 
Allow leading whitespace in textstring prevalue editor
 2017-06-29 14:40:10 +02:00
Claus
863b97039c Merge pull request #1632 from bjarnef/dev-v7-U4-9181 
U4-9181 - Fix sorting of grid editor config
 2017-06-29 13:55:12 +02:00
Mads Rasmussen
a082b72f50 set change password button size to the same as the other buttons 2017-06-29 12:30:50 +02:00
Mads Rasmussen
69791a3616 use userGroups resource in userGroups picker 2017-06-29 12:25:28 +02:00
Shannon
72bdc0f070 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-29 19:15:22 +10:00
Shannon
4f28cb1917 Gets content permissions saving per user group 2017-06-29 19:15:04 +10:00
Mads Rasmussen
ed78082693 aligning UI for pickers 2017-06-29 10:15:10 +02:00
Mads Rasmussen
91e15d4b64 use userGroupsResource in users and groups overview 2017-06-29 09:57:24 +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
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
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