Commit Graph

19696 Commits

Author SHA1 Message Date
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
Claus
da00ad1444 Merge branch 'abryukhov-temp-U4-10139' into dev-v7 2017-07-12 15:10:51 +02:00
Claus
7bc52b3948 localization fixes. 2017-07-12 15:06:29 +02:00
Claus
a77aec4156 Merge branch 'temp-U4-10139' of git://github.com/abryukhov/Umbraco-CMS into abryukhov-temp-U4-10139 2017-07-12 14:36:47 +02:00
Claus
f7f3dccfc8 Merge pull request #2042 from umbraco/temp-fsTreeController
filesystem controller compatibility
2017-07-12 14:27:00 +02:00
Claus
ab3469d703 cleanup. 2017-07-12 14:26:44 +02:00
Claus
c78ea90cf5 cleaning up a bit. 2017-07-12 14:24:09 +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
Sebastiaan Janssen
3de0b85ae3 Merge pull request #2001 from umbraco/temp-u4-9993
U4-9993 - fix upgrade issues
2017-07-12 12:59:19 +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
7115d85440 Removes unused and unneeded APIs on IUserService, updates code comments to describe implicit vs explicit permissions 2017-07-12 14:06:30 +10:00
Shannon
d9937fb276 Stop trying to build the UI.Client project as part of the sln build 2017-07-12 14:01:36 +10:00
Stephan
87b51d1418 Merge branch dev-v7 into temp-fsTreeController 2017-07-11 19:06:01 +02:00
John Kilmister
8ea1af56ab U4-10143 - Improved error messages when we retrieve current xml node 2017-07-11 16:22:21 +01:00
Stephan
219eb61194 Merge branch 'dev-v7' into temp-u4-9993 2017-07-11 14:47:54 +02:00
Claus
7f98f99eaa Merge pull request #2039 from umbraco/temp-u4-10121
U4-10121 - Scheduled Publishing as background task
2017-07-11 11:37:46 +02:00
Shannon
53bce239c3 Gets implicit/inherited permissions 'working', well at least with one test, now need to test the rest. 2017-07-11 19:19:38 +10:00
Robert
1d3279fe07 Merge pull request #2036 from bjarnef/dev-v7-U4-10130
U4-10130 - Equal height of input and button
2017-07-11 10:48:23 +02:00
Robert
88bb796f4d Merge branch 'dev-v7' into dev-v7-U4-10130 2017-07-11 10:41:58 +02:00
Robert
97878ac25a Merge pull request #2037 from bjarnef/dev-v7-U4-9933
U4-9933 - Update datepicker styles
2017-07-11 09:56:48 +02:00
Alexander Bryukhov
c87e880b64 Minor localization issues U4-10139 2017-07-11 14:15:07 +07: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
Stephan
79df75c415 U4-10121 - Scheduled Publishing as background task 2017-07-10 13:39:40 +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
Bjarne Fyrstenborg
e28ba446a0 Open context menu when clicking "Do something else" 2017-07-08 01:20:26 +02:00
Bjarne Fyrstenborg
c645a2cf15 Update styles of datepicker 2017-07-08 00:45:18 +02:00
Bjarne Fyrstenborg
5fb8d990f8 Include original missing changes 2017-07-07 23:52:20 +02:00
Bjarne Fyrstenborg
8626e4337f Adjust search icon position 2017-07-07 23:40:02 +02:00
Bjarne Fyrstenborg
0f22c41eee Update height of input in header 2017-07-07 23:21:19 +02:00
Bjarne Fyrstenborg
e73fda14b5 Adjust height of input fields 2017-07-07 23:16:11 +02:00
Bjarne Fyrstenborg
a04df8070a Revert "Make examine search input and button more consistent with UI"
This reverts commit 60c1052db1.
2017-07-07 22:51:32 +02:00
Bjarne Fyrstenborg
60c1052db1 Make examine search input and button more consistent with UI 2017-07-07 22:12:27 +02:00