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

5042 Commits

Author SHA1 Message Date
Shannon
595e26e41f U4-10221 When creating content that has Content Templates (blueprints) created for it, we should distinguish between "Blank' and Blueprints 2017-08-02 15:30:17 +10:00
Shannon
dda19e292a U4-10217 Blueprints: When clicking "Create Blueprint", add explanation on what it is and what will happen 2017-08-02 13:28:50 +10:00
Shannon
08f07ff3b7 Moves blueprint localization copy into it's own section in the lang files 2017-08-02 12:58:31 +10:00
Shannon
9d3a1fe529 updates design so it works and some wording for blueprints intro 2017-08-02 12:26:33 +10:00
Shannon
4f396222dc Merge branch 'dev-v7.7' into temp-blueprint-rename 2017-08-02 12:13:04 +10:00
Mads Rasmussen
b0f1b19385 allow current user to see but not edit its access rights 2017-08-01 20:06:19 +02:00
Mads Rasmussen
b6de92167b remove "lorem ipsum" + fix title on node permissions overlay 2017-08-01 19:40:11 +02:00
Niels Hartvig
7e49cc0f25 Implements U4-10219 and U4-10218 2017-08-01 16:19:32 +02:00
Mads Rasmussen
1c5bcbc5bb U4-10202 Make it more obvious when no content or media start nodes are selected the user has access to the root node. 2017-08-01 16:18:57 +02:00
Mads Rasmussen
60cd82884f add localizationService as dependency to userGroupPicker controller 2017-08-01 14:13:02 +02:00
Mads Rasmussen
0786d0849c fix js errors in user controller after merge 2017-08-01 10:34:19 +02:00
Shannon
2e6fb8e3e5 Fixes merge issues, ensures "Content root" and "Media root" are localized 2017-08-01 12:41:22 +10:00
Shannon
cee3f456d1 Merge branch 'dev-v7.7' into temp-U4-10202 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-08-01 12:40:47 +10:00
Shannon
175da06d60 Merge branch 'dev-v7.7' into temp-U4-10059 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/users/group.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-08-01 11:31:52 +10:00
Shannon
7769a0ba42 Updates logic to show if the user or group has not start nodes defined (which does not anymore indicate root access) 2017-08-01 11:19:31 +10:00
Shannon
fd65380367 Merge branch 'dev-v7.7' into temp-U4-10202 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
 2017-08-01 10:35:37 +10:00
Shannon Deminick
9880e9b6a5 Merge pull request #2086 from umbraco/temp-U4-10212 
fixes: U4-10212 Clean up test css classes
 2017-08-01 10:32:53 +10:00
Shannon Deminick
134033bc3d Merge pull request #2085 from umbraco/temp-U4-10210 
fixes: U4-10210 Add title and filter to user groups overview
 2017-08-01 10:31:05 +10:00
Shannon Deminick
8bf3835212 Merge pull request #2070 from umbraco/temp-U4-10155 
fixes: U4-10155 Prompt the user before deleting user groups in the us…
 2017-08-01 10:16:02 +10:00
Shannon Deminick
7b449b4bad Merge pull request #2079 from umbraco/temp-U4-10095 
U4-10095 Need to be able to remove a user's avatar
 2017-08-01 09:40:47 +10:00
Mads Rasmussen
c539db39ec fixes: U4-10212 Clean up test css classes 2017-07-31 14:58:17 +02:00
Mads Rasmussen
2cc881883b fixes: U4-10210 Add title and filter to user groups overview 2017-07-31 13:20:33 +02:00
Mads Rasmussen
164f1e253e only show "remove photo" button if the user has an avatar 2017-07-31 11:39:59 +02:00
Mads Rasmussen
38ae9d6d52 update lorem ipsum texts 2017-07-31 10:52:45 +02:00
Mads Rasmussen
939d429b8b localise user group picker and user group controller 2017-07-31 09:23:20 +02:00
Shannon
796708075c Fixes JS errors when loading in a textbox editor when there is no config supplied (i.e. rendering a Forms Macro in the RTE) 2017-07-31 16:23:44 +10:00
Shannon
b20e3c7435 ensure the user cannot access the media list dashboard if they don't have root access 2017-07-31 16:03:31 +10:00
Shannon
6de2cea9c5 U4-10023 - rte link picker disable media uploading if no start node access 2017-07-31 15:53:21 +10:00
Shannon
9db9112407 U4-10023 - rte media picker disable uploading if no start node access 2017-07-31 15:49:44 +10:00
Mads Rasmussen
7707bfe700 more localisation of users and user groups 2017-07-28 14:12:35 +02:00
Mads Rasmussen
47290cd801 init localise on users and groups 2017-07-28 13:25:29 +02:00
Stephan
b10d370b16 Merge branch dev-v7.7 into user-group-permissions 2017-07-28 12:54:13 +02:00
Stephan
9c27a6c69a Merge branch 'dev-v7.7' into temp-isearchabletree 2017-07-28 12:33:13 +02:00
Mads Rasmussen
43bb9ab69b set default title on user picker overlay and section picker overlay 2017-07-28 10:37:30 +02:00
Stephan
239a7632b0 Merge pull request #2057 from umbraco/temp-U4-10138 
U4-10138 Cannot upgrade to 7.7 due to user groups
 2017-07-28 09:55:41 +02:00
Shannon Deminick
04a7e2e04e Merge pull request #2078 from umbraco/temp-U4-10107 
fixes: U4-10107 Weird UI bugs with filter dropdowns
 2017-07-28 16:43:21 +10:00
Mads Rasmussen
ef20deb9cb fixes: U4-10202 Make it more obvious when no content or media start nodes are selected the user has access to the root node. 2017-07-27 14:55:23 +02:00
Stephan
4569a52806 U4-10175 - fix 'edit user' link 2017-07-27 12:37:09 +02:00
Mads Rasmussen
ca2896aaaa Didn't want to remove that 2017-07-27 11:03:03 +02:00
Mads Rasmussen
0b77e604f6 add button to remove avatar 2017-07-27 10:55:38 +02:00
Mads Rasmussen
f50153728d manually show/hide filters 2017-07-26 15:21:30 +02:00
Stephan
52a46a2fe0 Merge branch 'user-group-permissions' into temp-U4-10175 2017-07-26 15:18:37 +02:00
Mads Rasmussen
1692000117 umb-keyboard-list polish 2017-07-26 14:12:55 +02:00
Stephan
9972f95a10 Merge branch user-group-permissions into temp-U4-10084 2017-07-26 13:22:43 +02:00
Mads Rasmussen
964a8b400f close umb-dropdown on esc press 2017-07-26 12:16:54 +02:00
Stephan
0762bd7e76 U4-10023 - also in grid media picker 2017-07-26 11:31:19 +02:00
Stephan
15c5900a24 U4-10023 - virtual root start node in mediapicker 2017-07-26 10:44:42 +02:00
Mads Rasmussen
1ec63c3f85 add documentation to umbDropdown, umbDropdownItem and umbKeyboardList 2017-07-26 10:36:02 +02:00
Shannon
b8e2e49a44 Updates to latest Katana libs 2017-07-26 17:50:58 +10:00
Stephan
a8c29644d4 U4-10023 - multiple start nodes 2017-07-26 08:35:08 +02:00