Shannon
|
960cc32da1
|
Ensures the user validator doesn't execute unless the username or email addres is changed (since that is all the validator validates)
|
2017-07-28 12:20:10 +10:00 |
|
Stephan
|
fdf206038a
|
Merge branch user-group-permissions into temp-U4-10138
|
2017-07-27 13:37:49 +02:00 |
|
Stephan
|
da9fd1a9e8
|
Merge pull request #2061 from umbraco/temp-U4-10084
U4-10084 Cleanup all unused/legacy webforms editors, tinymce files and affiliated services
|
2017-07-26 14:49:05 +02:00 |
|
Stephan
|
9972f95a10
|
Merge branch user-group-permissions into temp-U4-10084
|
2017-07-26 13:22:43 +02:00 |
|
Stephan
|
0762bd7e76
|
U4-10023 - also in grid media picker
|
2017-07-26 11:31:19 +02:00 |
|
Stephan
|
15c5900a24
|
U4-10023 - virtual root start node in mediapicker
|
2017-07-26 10:44:42 +02:00 |
|
Shannon
|
fad090658f
|
Fixes more tests
|
2017-07-26 18:33:09 +10:00 |
|
Shannon
|
61c3816bb9
|
Fixes a bunch of tests
|
2017-07-26 18:26:25 +10:00 |
|
Shannon
|
b8e2e49a44
|
Updates to latest Katana libs
|
2017-07-26 17:50:58 +10:00 |
|
Shannon
|
6d9190bdb3
|
ensures all built in groups have -1 as start nodes for media, fixes automapper tests
|
2017-07-26 17:24:26 +10:00 |
|
Shannon
|
72998e1a6e
|
Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions
|
2017-07-26 17:18:28 +10:00 |
|
Shannon
|
ff87d8b414
|
Make sure the migration explicitly specifies that -1 is that start node for all built in groups
|
2017-07-26 17:18:05 +10:00 |
|
Stephan
|
a8c29644d4
|
U4-10023 - multiple start nodes
|
2017-07-26 08:35:08 +02:00 |
|
Stephan
|
bb9ec82060
|
Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions
|
2017-07-25 18:39:47 +02:00 |
|
Shannon Deminick
|
56b1e0902e
|
Merge pull request #2068 from umbraco/temp-U4-10109
fixes: U4-10109 Need to indicate that granular permission entries can…
|
2017-07-25 18:54:25 +10:00 |
|
Shannon
|
17d17cfb82
|
Puts back in some old APIs that were removed to maintain some backwards compat with < 7.7 for users
|
2017-07-25 18:39:23 +10:00 |
|
Shannon
|
fa89bef11a
|
Merge branch 'dev-v7.7' into user-group-permissions
|
2017-07-25 15:16:37 +10:00 |
|
Shannon
|
39e4bf4579
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# src/Umbraco.Web/PublishedContentExtensions.cs
|
2017-07-25 15:15:56 +10:00 |
|
Mads Rasmussen
|
f043a2e4ee
|
fixes: U4-10109 Need to indicate that granular permission entries can be edited
|
2017-07-24 14:18:36 +02:00 |
|
Stephan
|
c5e7e1e39e
|
U4-10144 - dont break again
|
2017-07-24 14:05:04 +02:00 |
|
Shannon
|
db2a35dbce
|
fixes a localized key that doesn't exist
|
2017-07-24 20:23:54 +10:00 |
|
Sebastiaan Janssen
|
3d006f1e08
|
Merge pull request #2065 from akierczynska/patch-2
Update pl.xml to match en.xml
|
2017-07-24 09:30:33 +02:00 |
|
akierczynska
|
e0c891719f
|
Update pl.xml to match en.xml
Updating pl.xml with new keys to match en.xml
|
2017-07-24 00:04:11 +01:00 |
|
Sebastiaan Janssen
|
89a14c13e5
|
Merge pull request #2060 from soreng/patch-4
Changed name of argument in validation
|
2017-07-21 15:14:33 +02:00 |
|
Sebastiaan Janssen
|
ca9aa21c7b
|
Merge pull request #2064 from pijemcolu/temp-U4-10187
U4-10187 - Fix link to training in Backoffice -> Settings->Dashboard
|
2017-07-21 14:42:49 +02:00 |
|
Stephan
|
c0eaeb3168
|
Fix tests with issues
|
2017-07-21 13:06:23 +02:00 |
|
pijemcolu
|
74e16c0f8d
|
fix link to training in Settings->Dashboard
|
2017-07-21 10:14:07 +02:00 |
|
Stephan
|
fedd9e2897
|
Fix User deep-cloning
|
2017-07-20 16:52:13 +02:00 |
|
Shannon
|
a92288cd61
|
Fixes implementation of the role store on the BackOfficeUserStore
|
2017-07-20 22:12:13 +10:00 |
|
Shannon
|
97471f667d
|
Updates the BackOfficeIdentityUser to property support ASP.NET Identity Roles
|
2017-07-20 22:02:32 +10:00 |
|
Shannon
|
7aca656919
|
Merge branch 'user-group-permissions' into temp-U4-10138
# Conflicts:
# src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
# src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
|
2017-07-20 20:00:05 +10:00 |
|
Shannon
|
c309e5edaf
|
Removes even more
|
2017-07-20 19:23:46 +10:00 |
|
Shannon
|
e76ad837b9
|
Fixes script and partial views trees
|
2017-07-20 19:16:28 +10:00 |
|
Shannon
|
0b6ed42201
|
Removes a bunch more files
|
2017-07-20 19:15:45 +10:00 |
|
Shannon
|
a875ede3da
|
Removes a ton of old unused legacy files
|
2017-07-20 18:55:38 +10:00 |
|
Stephan
|
f8fac9f84e
|
U4-9430 - fix
|
2017-07-20 10:21:21 +02:00 |
|
Stephan
|
83ce359234
|
Merge pull request #1992 from Bitmapped/U4-9430
U4-9430 Fix
|
2017-07-20 10:20:06 +02:00 |
|
Shannon
|
69fc7c4b7c
|
reverts removing cook computing dll and ensures we still ship with it, removes publish.aspx
|
2017-07-20 16:44:28 +10:00 |
|
Shannon
|
e9e2a86e2e
|
U4-5546 Remove user 'channels', weblog api, and all code / db tables relevant to those
|
2017-07-20 15:47:26 +10:00 |
|
Søren Gregersen
|
2c64f91b25
|
Changed name of argument in validation
Minor change... :)
|
2017-07-19 22:23:22 +02:00 |
|
Stephan
|
964f3bae60
|
Optimize start nodes calc
|
2017-07-19 19:26:25 +02:00 |
|
Sebastiaan Janssen
|
e702fe2877
|
Merge pull request #2055 from dawoe/patch-2
Fix value converter work for legacy media picker
|
2017-07-19 12:31:46 +02:00 |
|
Sebastiaan Janssen
|
9d55656ae9
|
Merge pull request #2058 from umbraco/temp-u4-10128
U4-10128 - GetKey unwraps
|
2017-07-19 12:26:12 +02:00 |
|
Stephan
|
d57de05453
|
U4-10128 - super improve
|
2017-07-19 12:24:00 +02:00 |
|
Stephan
|
11e4bf5de8
|
U4-10128 - improve
|
2017-07-19 12:08:31 +02:00 |
|
Stephan
|
82661d9af4
|
U4-10128 - GetKey unwraps
|
2017-07-19 11:51:46 +02:00 |
|
Shannon
|
ee3f977565
|
Fixes issue that when we re-update the user ticket we also need to refresh the CSRF tokens
|
2017-07-19 19:42:12 +10:00 |
|
Shannon
|
8f984c8dc8
|
Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions
# Conflicts:
# src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
|
2017-07-19 19:26:26 +10:00 |
|
Shannon
|
8df00d5525
|
Fixes U4-10111 Changing email on a user doesn't show the username field
|
2017-07-19 19:22:43 +10:00 |
|
Shannon Deminick
|
05d9eca904
|
Merge pull request #2056 from umbraco/temp-u4-10173
u4-10173
|
2017-07-19 19:11:12 +10:00 |
|