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

20127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
73b107ee2a Fixing U4-10138 Cannot upgrade to 7.7 due to user groups and U4-7907 With non OAuth external login providers we should have an 'auto-link' / 'auto-create' callback option 2017-07-18 19:53:34 +10:00
Stephan
945050858e Cleanup 2017-07-18 09:11:12 +02: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
Shannon
a0d3c18acc Fixes build script to work with VS 2017 (only) and fixes BuildBelle since it didn't work and is missing tools 2017-07-18 13:10:17 +10:00
Shannon Deminick
bd848b00ff Merge pull request #2046 from umbraco/temp-U4-10075 
U4-10075 Inherited permissions for content nodes
 2017-07-18 11:56:08 +10:00
Bjarne Fyrstenborg
50d7114209 Update localization of email 2017-07-18 00:07:22 +02: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
d4714e1580 Merge pull request #2052 from umbraco/dev-v7.6 
Oops was targeting old branch :)
 2017-07-17 22:12:47 +02:00
Sebastiaan Janssen
2b22e6a784 Merge pull request #1940 from AndyButland/u4-9892 
U4-9892 - ordered media types when returned for create dialog
 2017-07-17 22:09:00 +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
338c7cc5a6 Merge branch 'callumbwhyte-U4-9934' into dev-v7 2017-07-17 21:31:43 +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
895f0a9dfe Merge pull request #1982 from AndyButland/u4-9987 
Extended HttpsCheck healthcheck to check for expiring SSL certificate
 2017-07-17 21:26:03 +02:00
Sebastiaan Janssen
ec03a3dc42 Merge pull request #1989 from HarveyWilliams/patch-2 
Fix for `IsDocumentTypeRecursive` - U4-9997
 2017-07-17 21:23:18 +02:00
Sebastiaan Janssen
5a4dbba21b Merge pull request #1998 from Jeavon/temp-U4-10013 
U4-10013 Umbraco.MediaPicker value converter does not understand ints
 2017-07-17 20:40:24 +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
Sebastiaan Janssen
bdc4e1ae6a Merge pull request #2041 from blueboxes/dev-v7 
U4-10143 - Improved error messages when we retrieve current xml node
 2017-07-17 19:51:49 +02:00
Sebastiaan Janssen
3cb05870af Merge pull request #2051 from mistyn8/U4-10171 
Update treepicker.html [U4-10171] add ability to remove picker item
 2017-07-17 18:15:23 +02:00
Sebastiaan Janssen
95b0c342bb Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-07-17 17:51:39 +02:00
Sebastiaan Janssen
3a5584a1c1 Some updates to description and code style 2017-07-17 17:50:38 +02:00
Sebastiaan Janssen
b425edbb45 Merge branch 'srmooney-U4-10088' into dev-v7 2017-07-17 17:30:56 +02:00
Sebastiaan Janssen
b403283368 Merge branch 'U4-10088' of https://github.com/srmooney/Umbraco-CMS into srmooney-U4-10088 2017-07-17 17:30:32 +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
Stephan
3ac64f18d2 Bugfix UserModelMapper 2017-07-17 15:08:45 +02: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
Warren Buckley
4d0a2c85b7 Merge pull request #2049 from umbraco/temp-U4-5672 
U4-5672 Properties and Tabs moving/incorrect when Enable list view se…
 2017-07-17 09:41:37 +01: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
Sebastiaan Janssen
e1957b895f U4-5672 Properties and Tabs moving/incorrect when Enable list view selected 2017-07-17 09:46:30 +02:00
Stephan
04daaef7b7 Merge branch 'user-group-permissions' into temp-U4-10075 2017-07-14 20:15:51 +02:00
Stephan
29aaa26022 U4-10023 - fix media picker for multiple start nodes 2017-07-14 20:13:57 +02:00
Robert
84de083d52 Merge remote-tracking branch 'origin/temp-U4-7497' into temp-U4-7497 2017-07-14 13:57:36 +02:00
Robert
6ccb822cb5 On textbox delete the next in line gets focused 
umbfocusbackwards.directive.js file added
 2017-07-14 13:56:11 +02:00
Robert
c94338d2b6 Newly added text box now get's focused. 2017-07-14 13:56:11 +02:00
Robert
3ba001164f Changed to keyup 2017-07-14 13:56:11 +02:00
Robert
a8c0367492 Add/Remove functionality on key press added 2017-07-14 13:56:11 +02:00
Robert
91646212fd add/remove functionality on keyDown added 2017-07-14 13:56:11 +02:00
Robert
4c9b2f552a On textbox delete the next in line gets focused 
umbfocusbackwards.directive.js file added
 2017-07-14 13:30:28 +02:00
Shannon Deminick
3f6ec6e36f Merge pull request #2045 from umbraco/temp-U4-10106 
U4-10106 Cannot delete user groups
 2017-07-14 10:53:27 +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
db863a4592 update sln to stop building the damn UI project 2017-07-14 10:49:10 +10:00
Shannon
ca104347b3 Merge branch 'user-group-permissions' into temp-U4-10106 2017-07-14 10:43:45 +10:00
Shannon
9fbf1aedac adds both post and delete verbs 2017-07-14 10:43:12 +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