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
247ca906aa Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-07-03 15:10:10 +10:00
Mads Rasmussen
bcffc37287 revert this for now 2017-06-30 21:29:24 +02:00
wanddy
280ad246ab Merge remote-tracking branch 'remotes/origin/dev-v7' into dev-v7 2017-06-30 19:46:09 +08:00
Mads Rasmussen
8d2a9d1d81 fixes: U4-10060 Make UI for user groups overview 2017-06-30 13:33:59 +02:00
Stephan
43e0ef2472 Merge branch 'dev-v7' into temp-u4-9993 2017-06-30 11:02:43 +02:00
Mads Rasmussen
2aaf104856 change text on cancel button to close 2017-06-30 10:51:23 +02:00
Claus
44cfe5da84 missing nullcheck. 2017-06-30 10:46:44 +02:00
Shannon
224d1bcf6e U4-10053 Review anywhere else in the codebase that may reference User Type 
and removes all old editors, trees, etc...
 2017-06-30 18:38:02 +10:00
Mads Rasmussen
6ebacf118e fix grunt build 2017-06-30 10:36:55 +02:00
Claus
d5fd266b19 missing semicolon. 2017-06-30 10:34:58 +02:00
Shannon
e4edd8f692 U4-10053 Review anywhere else in the codebase that may reference User Type 
This also removes some totally unused and ancient code
 2017-06-30 18:14:44 +10:00
Shannon
8fe904cea7 changing spaces back to 4, finally in sync with mads 2017-06-30 17:24:48 +10:00
Shannon
3a17002ec4 fixes build after merge 2017-06-30 17:21:40 +10:00
Shannon
804c60653e Merge branch 'dev-v7.7' into user-group-permissions 
# Conflicts:
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
 2017-06-30 16:57:22 +10:00
Shannon
29c6d547db Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-06-30 16:55:04 +10:00
Shannon
546999e470 U4-9946 Update the ExternalSignInAutoLinkOptions to support groups - currently still using UserType 2017-06-30 16:50:44 +10:00
Shannon
0da75f4e78 Updates content permissions dialog to show the explicit permissions assigned and removing them will reset them. 2017-06-30 16:32:01 +10:00
Shannon
e69957e580 Merge remote-tracking branch 'origin/user-group-permissions' into user-group-permissions 2017-06-30 14:45:07 +10:00
Shannon
a072d4edb3 adds security to changing premissions in the content dialog 2017-06-30 14:42:08 +10:00
wanddy
5768992ccc Improve Chinese translation to match the newest version based on en.xml file. 
Signed-off-by: wanddy <wanddy@163.com>
 2017-06-30 12:10:59 +08:00
Mads Rasmussen
968f93f769 stop toggles from closing the dialogs 2017-06-29 15:28:38 +02:00
Mads Rasmussen
0c6c3f6d51 add notifications to content permissions dialog 2017-06-29 15:12:12 +02:00
Mads Rasmussen
81aae79b42 Merge pull request #2015 from umbraco/temp-U4-9839 
U4-9839 Media Picker: If I only upload one photo then select it as a …
 2017-06-29 14:54:49 +02:00
Claus
9edbb3fc26 Merge pull request #1634 from soreng/patch-2 
use already defined variable, instead of mapping the path twice
 2017-06-29 14:47:21 +02:00
Claus
7fdd2bcdfc Merge pull request #2018 from AndyButland/u4-4090 
Fixes U4-4090 - by preserved line breaks in property descriptions...
 2017-06-29 14:43:13 +02:00
Claus
ba90fdeb56 Merge pull request #1778 from bjarnef/dev-v7-U4-9585 
Allow leading whitespace in textstring prevalue editor
 2017-06-29 14:40:10 +02:00
Claus
d6bae1b58f Merge pull request #1958 from poornimanayar/U4-9661 
U4-9661 Remove "move" button in member section
 2017-06-29 14:37:00 +02:00
Claus
ef53db52f7 Merge pull request #1850 from pijemcolu/temp-U4-9710 
U4-9710 ImageCropDataSet.HasImage returns wrong value
 2017-06-29 14:07:59 +02:00
Claus
863b97039c Merge pull request #1632 from bjarnef/dev-v7-U4-9181 
U4-9181 - Fix sorting of grid editor config
 2017-06-29 13:55:12 +02:00
Claus
1a1adbf647 Merge pull request #2024 from greystate/drobar-partialviews 
Updates to partialviews
 2017-06-29 13:47:54 +02:00
Claus
5c745565da Merge pull request #2025 from umbraco/temp-U4-8970 
U4-8988 Adding translations for Chinese (Taiwan)
 2017-06-29 13:28:06 +02:00
Claus
5dec54badb U4-8988 Adding translations for Chinese (Taiwan) 2017-06-29 13:27:31 +02:00
Claus
e5e725b376 Merge pull request #2022 from umbraco/temp-U4-5454 
Temp u4 5454
 2017-06-29 12:32:57 +02:00
Mads Rasmussen
a082b72f50 set change password button size to the same as the other buttons 2017-06-29 12:30:50 +02:00
Mads Rasmussen
69791a3616 use userGroups resource in userGroups picker 2017-06-29 12:25:28 +02:00
Shannon
72bdc0f070 Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-06-29 19:15:22 +10:00
Shannon
4f28cb1917 Gets content permissions saving per user group 2017-06-29 19:15:04 +10:00
Claus
6cb104cd4f Merge pull request #2023 from umbraco/drbldgtl-dev-v7-U4-5804 
U4-5804 Remove all the old images that are no longer used in the umbraco and umbraco_client folders
 2017-06-29 10:50:09 +02:00
Claus
af3665c0f9 Merge branch 'dev-v7-U4-5804' of git://github.com/drbldgtl/Umbraco-CMS into drbldgtl-dev-v7-U4-5804 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-06-29 10:48:04 +02:00
Mads Rasmussen
ed78082693 aligning UI for pickers 2017-06-29 10:15:10 +02:00
Claus
f0f25c67c6 refactoring method signatures to prevent breaking changes. 2017-06-29 10:00:16 +02:00
Mads Rasmussen
91e15d4b64 use userGroupsResource in users and groups overview 2017-06-29 09:57:24 +02:00
Claus
da8c0726b1 Merge branch 'U4-5454' of git://github.com/trt/Umbraco-CMS into temp-U4-5454 2017-06-29 08:59:45 +02:00
Claus
2fbb9721fa updating language files. 2017-06-29 08:53:22 +02:00
Claus
de6ffd456c Merge pull request #1972 from wanddy/dev-v7-chnfixnew 
Fix translation didn't work in some tree node
 2017-06-29 08:47:37 +02:00
Claus
5b3ff58ad8 Merge pull request #1964 from esn303/patch-2 
Update "Element hinzufügen" (Add grid element)
 2017-06-29 08:14:08 +02:00
Shannon
5dec4a4a94 Moves logic to separate UserGroupsController from the user controller, refactors a few model mappings to reduce a few lines of code, default permissions on user groups now save 2017-06-29 14:39:11 +10:00
Shannon
5d5b852e5a moves the change password part of the user to where the design had it 2017-06-29 13:17:19 +10:00
Shannon
454684e108 updates user models to not return so much info when not needed 2017-06-29 13:13:32 +10:00
Shannon
4fc5279a78 ok, tests fixed now? 2017-06-29 12:38:33 +10:00