Claus
|
deaece7cfc
|
more clauses.
|
2017-07-10 13:37:57 +02:00 |
|
Claus
|
a3bb11e4b0
|
I got a feeling you did this on purpose :P
|
2017-07-10 13:05:33 +02:00 |
|
Claus
|
f2b52585e1
|
U4-10111 Changing email on a user doesn't show the username field
|
2017-07-10 12:22:35 +02:00 |
|
Claus
|
8b308fa1ea
|
hide the count until the property is set.
|
2017-07-10 12:22:12 +02:00 |
|
Claus
|
779306d90f
|
typos.
|
2017-07-06 15:08:01 +02:00 |
|
Claus
|
7540f49a5e
|
fixing a bunch of mismatching mappings.
aligning property names with what they actually are.
|
2017-07-06 14:41:05 +02:00 |
|
Claus
|
2e29d112e5
|
reformatting.
|
2017-07-06 13:14:24 +02:00 |
|
Claus
|
fe451154d1
|
fixing some markup errors
|
2017-07-06 13:14:17 +02:00 |
|
Claus
|
271056f997
|
mapping media start nodes instead of mapping content twice.
|
2017-07-06 12:48:47 +02:00 |
|
Shannon
|
9b0f2145d0
|
Fixes user state filtering to do an OR
|
2017-07-06 19:51:59 +10:00 |
|
Shannon
|
f355b27d1f
|
Merge branch 'dev-v7.7' into user-group-permissions
|
2017-07-06 12:56:17 +10:00 |
|
Shannon
|
7e9afe7720
|
bumps version
|
2017-07-06 12:31:26 +10:00 |
|
Shannon
|
a050a73c31
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-07-06 12:28:51 +10:00 |
|
Shannon
|
403a210c1c
|
Fixes issue with assigning default permissions for a new user group
|
2017-07-05 19:25:48 +10:00 |
|
Shannon
|
03c7429653
|
FIxes SQL statement when upgrading with SQLCE and fixes GetAll when passing in an array of ints to ensure that we check if the int array is empty or not
|
2017-07-05 18:23:51 +10:00 |
|
Shannon
|
bba7b15125
|
Fixes installer angular module loading - this would have never worked without errors, not sure how we've missed this.
|
2017-07-05 18:22:45 +10:00 |
|
Shannon
|
1d9e33dadf
|
Granular permissions in group editor are all working, we could do with an edit button but for now it's ok, selecting the same node will perform an 'edit'
|
2017-07-04 15:40:33 +10:00 |
|
Shannon
|
316ec5d20f
|
gets granular permissions showing correctly in group editor
|
2017-07-04 15:07:11 +10:00 |
|
Shannon Deminick
|
9482104ec5
|
Merge pull request #2028 from umbraco/temp-U4-4905
Removed "remove paragraph tags" field
|
2017-07-04 12:33:25 +10:00 |
|
Robert
|
7053c175f8
|
Removed "remove paragraph tags" field
|
2017-07-03 13:44:37 +02:00 |
|
Shannon
|
82bd11e66d
|
Gets filtering on user state working
|
2017-07-03 19:27:48 +10:00 |
|
Claus
|
b2116480fc
|
fix formatting.
|
2017-07-03 11:17:05 +02:00 |
|
Shannon
|
94b0cb04da
|
fix tests
|
2017-07-03 17:58:04 +10:00 |
|
Claus
|
caef6cc623
|
Merge pull request #2026 from wanddy/dev-v7
Improve Chinese translation
|
2017-07-03 08:32:47 +02:00 |
|
Shannon
|
ff02b28d26
|
Fixes tree for single tree sections, fixes creating a user group so you can select default permissions
|
2017-07-03 16:31:47 +10:00 |
|
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 |
|
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 |
|