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 |
|
Claus
|
6a48c1646d
|
checking for uses of userType.
|
2017-07-13 09:26:48 +02:00 |
|
Claus
|
c8828b968c
|
found an extension method :)
|
2017-07-12 13:56:18 +02:00 |
|
Claus
|
2e28ff3ccf
|
U4-10106 Cannot delete user groups
|
2017-07-12 13:43:00 +02:00 |
|
Stephan
|
f18b7110c9
|
Minor fix in DataTypeValidateAttribute
|
2017-07-12 12:26:51 +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 |
|
Shannon
|
50a896a6cc
|
Doesn't send async if not using a network based SMTP server
|
2017-07-11 15:06:18 +10:00 |
|
Shannon
|
3c31e33000
|
Fixes U4-10133 Investigate issues with SMTP Invite and async
|
2017-07-11 14:46:51 +10:00 |
|
Shannon
|
9462f8ad85
|
Fixes password reset when there is invalid other password properties
|
2017-07-11 13:57:33 +10:00 |
|
Shannon
|
cb4e1d324d
|
Removes the NoCredentials enum (we don't use it or need it)
|
2017-07-11 12:18:12 +10:00 |
|
Stephan
|
13d26eb435
|
Merge branch dev-v7.7 into user-group-permissions
|
2017-07-10 17:48:51 +02:00 |
|
Claus
|
6a06a9e400
|
small tweak to skip a check if not needed.
|
2017-07-10 15:27:15 +02:00 |
|
Claus
|
1149129c6f
|
U4-10104 Dashboards are not showing up in backoffice
|
2017-07-10 15:21:24 +02:00 |
|
Claus
|
ad886efa62
|
cleanup and lineendings.
|
2017-07-10 15:20:17 +02:00 |
|
Claus
|
c0a6c58a07
|
U4-10134 Disabled doesn't override Invited
|
2017-07-10 13:38:39 +02:00 |
|
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 |
|
Sebastiaan Janssen
|
e9072aa6c9
|
Merge pull request #2031 from umbraco/temp-U4-10117
Adds a missing index to the cmsDictionary.key column with migrations since the column size needs to be reduced.
|
2017-07-06 15:31:05 +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
|
8e861eab43
|
Adds a missing index to the cmsDictionary.key column with migrations since the column size needs to be reduced.
|
2017-07-06 12:45:58 +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 |
|