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

5069 Commits

Author SHA1 Message Date
Mads Rasmussen
60ffd20e20 Merge branch 'dev-v7.7' into temp-U4-10059 2017-08-09 11:01:05 +02:00
Mads Rasmussen
fc8c750fb0 fixes permissions click area - only show pointer cursor where you can click 2017-08-08 10:22:44 +02:00
Shannon
bbe8271c35 Fixes invite user and setting the model correctly. Fixes server side validation to ensure any created user MUST have a group assigned. 2017-08-08 13:20:21 +10:00
Shannon
2d42a6ca16 Merge branch 'dev-v7.7' into temp-U4-10257 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
 2017-08-08 13:02:57 +10:00
Shannon Deminick
4879215146 Merge pull request #2104 from umbraco/temp-U4-10236 
fixes: U4-10236 Umbraco.7.7 beta - add larger click area of permissio…
 2017-08-08 12:57:13 +10:00
Shannon Deminick
48a6929077 Merge pull request #2106 from umbraco/temp-U4-10235 
fixes: U4-10235 Umbraco 7.7 beta - misleading placeholder text in pro…
 2017-08-08 12:52:12 +10:00
Shannon Deminick
efc52e26e5 Merge pull request #2105 from umbraco/temp-U4-10230 
fixes: U4-10230 Umbraco 7.7 beta - hover on table row affect datepicker
 2017-08-08 12:49:35 +10:00
Mads Rasmussen
405d8e8253 fix line indention 2017-08-07 21:32:19 +02:00
Mads Rasmussen
b335ca0a10 change input type to email 2017-08-07 21:19:30 +02:00
Mads Rasmussen
6658ecf6e3 add success state for "invite user" 2017-08-07 15:24:19 +02:00
Mads Rasmussen
cfee55d0db fix line indention 2017-08-07 14:35:54 +02:00
Mads Rasmussen
80d49f9bc8 fix line indention 2017-08-07 14:33:55 +02:00
Mads Rasmussen
6efc6dfe6a fixes: U4-10235 Umbraco 7.7 beta - misleading placeholder text in profile email 2017-08-07 13:45:42 +02:00
Mads Rasmussen
51624cee57 Merge pull request #2096 from skttl/patch-8 
U4-10231 Avatar is slightly off center
 2017-08-07 13:38:02 +02:00
Mads Rasmussen
701082a909 fixes: U4-10230 Umbraco 7.7 beta - hover on table row affect datepicker 2017-08-07 13:20:01 +02:00
Mads Rasmussen
81b2e4e050 fixes: U4-10236 Umbraco.7.7 beta - add larger click area of permission items 2017-08-07 12:27:21 +02:00
Mads Rasmussen
be9fbf14f1 Merge pull request #2095 from skttl/patch-7 
U4-10228: Overflowing text in group dropdown in permissions menu
 2017-08-07 12:08:58 +02:00
Shannon
e31ec37c9e Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-07 17:17:38 +10:00
Ronald Barendse
00e0f83c8e Fixed U4-10252 
Umbraco.Slider property editor did not use the correct initial values
when range was enabled and both values were equal.
 2017-08-06 22:41:20 +02:00
Mads Rasmussen
3ba3d8977f don't show start node data in the content permission dialog 2017-08-04 11:23:36 +02:00
Mads Rasmussen
19af28dd93 localize content permissions dialog 2017-08-04 11:21:43 +02:00
Mads Rasmussen
91cda667a2 U4-10221 When creating content that has Content Templates (blueprints) created for it, we should distinguish between "Blank' and Blueprints - swap class to one with no padding 2017-08-03 14:56:11 +02:00
Søren Kottal
9fc87a3986 Changes styling for avatar 
A div has been introduced, and is aligning the avatar to the left of the 40x40 block.

This moves the sizing and border-radius to the surrounding div, and adds a margin to center it.
 2017-08-02 20:31:35 +02:00
Søren Kottal
3a44f70cee Removes inline width on dropdown for groups 2017-08-02 19:55:05 +02:00
Sebastiaan Janssen
9b7b0d8923 Merge pull request #2092 from umbraco/temp-machine-key-install 
U4-10222 Install a custom machine key during umbraco installation
 2017-08-02 12:32:12 +02:00
Mads Rasmussen
36768a19c1 fixes: U4-10119 ISearchableTree UI updates 2017-08-02 12:18:06 +02:00
Shannon
150e2b12e8 adding back the functionality to install a machine key during installation 2017-08-02 16:16:59 +10:00
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