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 |
|
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
|
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 |
|
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 |
|
Stephan
|
2851216b88
|
U4-10173 - fix
|
2017-07-19 10:49:10 +02:00 |
|
Stephan
|
92dc70fc0c
|
Merge branch temp-u4-10173
|
2017-07-19 10:47:05 +02:00 |
|
Shannon
|
38cd3dcf94
|
Removes the AllStartNodeIds properties from IUser, updates all unit tests to work with the new methods, ensures the calculation is cached to the user object
|
2017-07-19 16:15:16 +10:00 |
|
Dave Woestenborghs
|
56cff6bba8
|
implemented suggestions from @jeavon
|
2017-07-18 17:11:49 +02:00 |
|
Stephan
|
f28136de91
|
U4-10173 - fix
|
2017-07-18 15:54:22 +02:00 |
|
Stephan
|
8c3f6dfc25
|
U4-10173 - refactor start nodes
|
2017-07-18 15:09:34 +02:00 |
|
Dave Woestenborghs
|
6b289e1a7d
|
Fix value converter work for legacy media picker
Fix for issue http://issues.umbraco.org/issue/U4-10178
|
2017-07-18 14:44:57 +02:00 |
|
Stephan
|
945050858e
|
Cleanup
|
2017-07-18 09:11:12 +02:00 |
|
Shannon
|
32dc9bd275
|
wires up the skip button
|
2017-07-18 14:48:19 +10:00 |
|
Shannon
|
f87245f73d
|
Fixes UI for U4-9914 UserController method to upload an avatar and set password when receiving invite
|
2017-07-18 14:45:09 +10:00 |
|
Shannon
|
0008afb455
|
Merge branch 'dev-v7.7' into user-group-permissions
# Conflicts:
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
|
2017-07-18 13:31:04 +10:00 |
|
Shannon
|
6f74fcf24a
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Umbraco.Web.csproj
|
2017-07-18 13:27:03 +10:00 |
|
Shannon
|
a0d3c18acc
|
Fixes build script to work with VS 2017 (only) and fixes BuildBelle since it didn't work and is missing tools
|
2017-07-18 13:10:17 +10:00 |
|
Shannon Deminick
|
bd848b00ff
|
Merge pull request #2046 from umbraco/temp-U4-10075
U4-10075 Inherited permissions for content nodes
|
2017-07-18 11:56:08 +10:00 |
|
Sebastiaan Janssen
|
91fa583f62
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2017-07-17 22:15:24 +02:00 |
|
Sebastiaan Janssen
|
23d91fd350
|
Adds removed method back in case someone is using it (would be breaking otherwise)
|
2017-07-17 22:14:59 +02:00 |
|
Sebastiaan Janssen
|
d4714e1580
|
Merge pull request #2052 from umbraco/dev-v7.6
Oops was targeting old branch :)
|
2017-07-17 22:12:47 +02:00 |
|
Sebastiaan Janssen
|
2b22e6a784
|
Merge pull request #1940 from AndyButland/u4-9892
U4-9892 - ordered media types when returned for create dialog
|
2017-07-17 22:09:00 +02:00 |
|
Sebastiaan Janssen
|
59840926c8
|
Merge pull request #1952 from callumbwhyte/U4-9934
U4 9934: Fixes deleting members in list view using custom membership provider
|
2017-07-17 22:01:33 +02:00 |
|
Sebastiaan Janssen
|
338c7cc5a6
|
Merge branch 'callumbwhyte-U4-9934' into dev-v7
|
2017-07-17 21:31:43 +02:00 |
|
Sebastiaan Janssen
|
77850aea18
|
Merge branch 'U4-9934' of https://github.com/callumbwhyte/Umbraco-CMS into callumbwhyte-U4-9934
|
2017-07-17 21:31:25 +02:00 |
|
Sebastiaan Janssen
|
895f0a9dfe
|
Merge pull request #1982 from AndyButland/u4-9987
Extended HttpsCheck healthcheck to check for expiring SSL certificate
|
2017-07-17 21:26:03 +02:00 |
|
Sebastiaan Janssen
|
ec03a3dc42
|
Merge pull request #1989 from HarveyWilliams/patch-2
Fix for `IsDocumentTypeRecursive` - U4-9997
|
2017-07-17 21:23:18 +02:00 |
|
Sebastiaan Janssen
|
5a4dbba21b
|
Merge pull request #1998 from Jeavon/temp-U4-10013
U4-10013 Umbraco.MediaPicker value converter does not understand ints
|
2017-07-17 20:40:24 +02:00 |
|
Sebastiaan Janssen
|
04546dd827
|
Merge pull request #2035 from bjarnef/dev-v7-U4-9945
U4-9945 - Fix vertical separator color and height of icon in custom section
|
2017-07-17 20:22:43 +02:00 |
|
Sebastiaan Janssen
|
4ecf1f919e
|
Merge pull request #2038 from bjarnef/dev-v7-U4-4079
U4-4079 - Open context menu in member section, when clicking "do something else" button
|
2017-07-17 20:18:37 +02:00 |
|