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

16736 Commits

Author SHA1 Message Date
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
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
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
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
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
Stephan
c696c62185 More fsTreeController cleanup 2017-07-13 15:12:14 +02:00
Stephan
2bff1bfbb6 U4-10121 - properly dispose context 2017-07-13 14:20:29 +02: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
Stephan
ab1dade468 U4-10121 - properly dispose context 2017-07-13 13:11:46 +02:00
mikkelhm
374fdcf29e Bumps version to 7.6.5 2017-07-13 12:14:32 +02:00
Shannon
1643eec62c Fixes cache refreshing for user groups since user cache need to be cleared for that too. Updates cache refreshers to use json.net for serializing which is way faster. adds better support for querying multiple user groups and entity ids for permissions, updates tests 2017-07-13 18:47:10 +10:00
Claus
6a48c1646d checking for uses of userType. 2017-07-13 09:26:48 +02:00
Shannon
6e89202002 Fixes usages of IUserService.GetPermission since before it was doing a FirstOrDefault() since that's just how the old APIs worked, now we need to get all permissions based on groups. Also updated the usages of ToString for char for the permissions to be culture invariant everywhere. 2017-07-13 14:32:43 +10:00
Shannon
69a6a80ffd Updates logic and test for getting all node permissions for a user that have explicit permissions defined 2017-07-13 14:16:13 +10:00
Shannon
c472463f37 Removes all user permissions cache refreshing and events and obsoletes assocated clsses 2017-07-13 11:02:34 +10:00
Shannon
76f9e2c22a Updates user permissions lookup to do one query instead of one query per user group 2017-07-13 10:43:42 +10:00
Shannon
df18cdc7f7 Merge remote-tracking branch 'origin/user-group-permissions' into temp-U4-10075 2017-07-13 01:58:18 +10:00
Shannon
87dcdc596e Gets last unit tests written for returning all permissions for either user or group when not specifying Ids 2017-07-13 01:56:22 +10:00
Shannon
044120ffd2 Gets inherited permissions working, adds lots of unit tests, few more tests to write now. 2017-07-13 00:07:51 +10: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
0acb0d48a1 Merge pull request #1858 from Jeavon/RelatedLinks-Tweaks 
Tweaks to RelatedLinks
 2017-07-12 15:26:53 +02:00