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
Mads Rasmussen
6e055f0d03 allow outside click to run when you click links and buttons 2017-07-25 15:59:28 +02:00
Mads Rasmussen
9b1f2352bd update view to use the new dropdown component and the list navigation directive 2017-07-25 15:58:14 +02:00
Mads Rasmussen
abbee60c9c add directive to navigate a list with arrow up and down 2017-07-25 15:56:51 +02:00
Mads Rasmussen
97ec0ecd08 add umb-dropdown component 2017-07-25 15:48:04 +02:00
Shannon
d232aa1f00 U4-10175 User avatar should refresh in top left corner when it's changed 2017-07-25 20:51:58 +10:00
Shannon Deminick
56b1e0902e Merge pull request #2068 from umbraco/temp-U4-10109 
fixes: U4-10109 Need to indicate that granular permission entries can…
 2017-07-25 18:54:25 +10:00
Shannon
fa89bef11a Merge branch 'dev-v7.7' into user-group-permissions 2017-07-25 15:16:37 +10:00
Shannon
39e4bf4579 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web/PublishedContentExtensions.cs
 2017-07-25 15:15:56 +10:00
Mads Rasmussen
5ade95d797 fixes: U4-10155 Prompt the user before deleting user groups in the user group list 2017-07-24 15:22:22 +02:00
Mads Rasmussen
f043a2e4ee fixes: U4-10109 Need to indicate that granular permission entries can be edited 2017-07-24 14:18:36 +02:00
Shannon
db2a35dbce fixes a localized key that doesn't exist 2017-07-24 20:23:54 +10:00
pijemcolu
74e16c0f8d fix link to training in Settings->Dashboard 2017-07-21 10:14:07 +02:00
Shannon
525254efd4 Merge branch 'dev-v7.7' into temp-isearchabletree 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Trees/ContentTreeController.cs
 2017-07-20 22:21:59 +10:00
Shannon
a875ede3da Removes a ton of old unused legacy files 2017-07-20 18:55:38 +10:00
Shannon
32dc9bd275 wires up the skip button 2017-07-18 14:48:19 +10:00
Shannon
f87245f73d Fixes UI for U4-9914 UserController method to upload an avatar and set password when receiving invite 2017-07-18 14:45:09 +10:00
Shannon
0008afb455 Merge branch 'dev-v7.7' into user-group-permissions 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
 2017-07-18 13:31:04 +10:00
Shannon
6f74fcf24a Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-07-18 13:27:03 +10:00
Sebastiaan Janssen
91fa583f62 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-07-17 22:15:24 +02:00
Sebastiaan Janssen
23d91fd350 Adds removed method back in case someone is using it (would be breaking otherwise) 2017-07-17 22:14:59 +02:00
Sebastiaan Janssen
59840926c8 Merge pull request #1952 from callumbwhyte/U4-9934 
U4 9934: Fixes deleting members in list view using custom membership provider
 2017-07-17 22:01:33 +02:00
Sebastiaan Janssen
77850aea18 Merge branch 'U4-9934' of https://github.com/callumbwhyte/Umbraco-CMS into callumbwhyte-U4-9934 2017-07-17 21:31:25 +02:00
Sebastiaan Janssen
04546dd827 Merge pull request #2035 from bjarnef/dev-v7-U4-9945 
U4-9945 - Fix vertical separator color and height of icon in custom section
 2017-07-17 20:22:43 +02:00
Sebastiaan Janssen
4ecf1f919e Merge pull request #2038 from bjarnef/dev-v7-U4-4079 
U4-4079 - Open context menu in member section, when clicking "do something else" button
 2017-07-17 20:18:37 +02:00
Mike Chambers
cb1d347769 Update treepicker.html 
resolves U4-10171 can't click remove icon, to remove picker item.
 2017-07-17 15:54:11 +01:00
Shannon
193682cd4c Ability to select the root node for the users start node 2017-07-17 20:09:00 +10:00
Shannon
d99f7b6ff6 Ability to select the root node for the users start node 2017-07-17 19:51:51 +10:00
Shannon
d1d74203ea Ability to select root node in user group picker so the user group can explicitly allow root access or not. 2017-07-17 19:40:45 +10:00
Shannon
e135291980 Fixes issue with user group start nodes, they are allowed to have null and by default this will be the case but we couldn't remove them and the ROOT node wasn't being mapped. 2017-07-17 18:23:20 +10:00
Shannon
8347d8f23b Merge remote-tracking branch 'origin/user-group-permissions' into temp-U4-10106 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-07-14 10:53:07 +10:00
Shannon Deminick
dfbd064de6 Merge pull request #2044 from umbraco/temp-U4-10096 
U4-10096 Ability to bulk assign users to groups in the user list
 2017-07-14 10:35:49 +10:00
Warren Buckley
17969e4537 Merge branch 'U4-4413_-_maxlength' of https://github.com/madjor5/Umbraco-CMS into madjor5-U4-4413_-_maxlength 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-07-13 13:09:06 +01:00
Claus
bcb19eea35 Merge pull request #1678 from PeteDuncanson/patch-2 
Fixed error label showing when you do a retry
 2017-07-12 15:47:32 +02:00
Claus
7bc52b3948 localization fixes. 2017-07-12 15:06:29 +02:00
Claus
a77aec4156 Merge branch 'temp-U4-10139' of git://github.com/abryukhov/Umbraco-CMS into abryukhov-temp-U4-10139 2017-07-12 14:36:47 +02:00
Claus
2e28ff3ccf U4-10106 Cannot delete user groups 2017-07-12 13:43:00 +02:00
Claus
44bb7e84db U4-10142 Adding a user - does not show up until refresh 2017-07-12 11:52:08 +02:00
Claus
06f68b1417 U4-10096 Ability to bulk assign users to groups in the user list 2017-07-12 11:31:34 +02:00
Robert
88bb796f4d Merge branch 'dev-v7' into dev-v7-U4-10130 2017-07-11 10:41:58 +02:00
Alexander Bryukhov
c87e880b64 Minor localization issues U4-10139 2017-07-11 14:15:07 +07:00
Shannon
9462f8ad85 Fixes password reset when there is invalid other password properties 2017-07-11 13:57:33 +10:00
Claus
8b308fa1ea hide the count until the property is set. 2017-07-10 12:22:12 +02:00
Bjarne Fyrstenborg
e28ba446a0 Open context menu when clicking "Do something else" 2017-07-08 01:20:26 +02:00
Bjarne Fyrstenborg
c645a2cf15 Update styles of datepicker 2017-07-08 00:45:18 +02:00
Bjarne Fyrstenborg
5fb8d990f8 Include original missing changes 2017-07-07 23:52:20 +02:00
Bjarne Fyrstenborg
8626e4337f Adjust search icon position 2017-07-07 23:40:02 +02:00
Bjarne Fyrstenborg
0f22c41eee Update height of input in header 2017-07-07 23:21:19 +02:00
Bjarne Fyrstenborg
e73fda14b5 Adjust height of input fields 2017-07-07 23:16:11 +02:00
Bjarne Fyrstenborg
a04df8070a Revert "Make examine search input and button more consistent with UI" 
This reverts commit 60c1052db1.
 2017-07-07 22:51:32 +02:00
Bjarne Fyrstenborg
60c1052db1 Make examine search input and button more consistent with UI 2017-07-07 22:12:27 +02:00