yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,028 Commits 4 Branches 7 Tags
ecc761a232d7ba2f2d75c3d61ca3090b3889a794
Commit Graph

1114 Commits

Author SHA1 Message Date
Stephan
cf450bebc3 Bugfix CombineStartNodes 2017-08-28 15:26:27 +02:00
Sebastiaan Janssen
7197c9cbb4 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Models/UserExtensions.cs
 2017-08-25 16:39:06 +02:00
Sebastiaan Janssen
9917fb20ca U4-10356 Update default Config/Lang after each update 
Also makes sure UserExtensions returns the correct language
 2017-08-25 16:13:04 +02:00
Sebastiaan Janssen
5ed4d9ccae Merge pull request #2117 from umbraco/temp-U4-10201 
U4-10201 Exception when deleting a user's start node - adds FKs, fixe…
 2017-08-24 20:04:44 +02:00
Shannon
2817a77c5a Null check fix - required for old trees, fixes backwards compat shim for AddApplication 2017-08-18 11:15:23 +10:00
Stephan
a157e1d596 Revert PublishedContentWrapped.Content rename 2017-08-17 20:40:32 +02:00
Claus
9169e64e39 cleanup and annoying line endings. 2017-08-17 11:22:05 +02:00
Shannon
049435a5e6 Puts back some APIs on the IUser interface to try to avoid more breaking changes. 2017-08-17 12:18:08 +10:00
mikkelhm
12eb496939 Adds the avatar column as a table to update in the 7.7.0 migration, and sets its length to 500 2017-08-10 12:37:11 +02:00
Shannon
3263e496aa U4-10201 Exception when deleting a user's start node - adds FKs, fixes delete scripts, adds migrations for FKs 2017-08-10 00:02:27 +10:00
Claus
73bc5c6ec9 changes needed for blueprints to differentiate them from content items. 2017-08-09 15:29:12 +02:00
Shannon
c6d7056a64 Updated to return nulls as opposed to the ex being caught with a meaningful message 2017-08-09 19:44:37 +10:00
Warren Buckley
b60c700e05 Updated to return nulls as opposed to the ex being caught with a meaningful message 2017-08-09 10:23:55 +01:00
Warren Buckley
8b962cff0c Catches a dictionary key not found exception & gives better error message with context 2017-08-08 16:07:16 +01:00
Stephan
1ee131db81 IContent.IsBlueprint required for blueprints 2017-08-02 15:02:34 +02:00
Stephan
5fab5102d9 Fix UmbracoObjectTypes enum bkwd compatibility issue 2017-08-01 15:51:23 +02:00
Shannon Deminick
7b449b4bad Merge pull request #2079 from umbraco/temp-U4-10095 
U4-10095 Need to be able to remove a user's avatar
 2017-08-01 09:40:47 +10:00
Shannon
cfd473bfe5 Fixing tests 2017-07-31 16:18:55 +10:00
Stephan
e52adfdd07 Merge branch user-group-permissions into temp-U4-8643 2017-07-28 10:38:43 +02:00
Shannon
27d7bc2ae1 Adds ability to remove gravatar 2017-07-28 16:02:46 +10:00
Stephan
fdf206038a Merge branch user-group-permissions into temp-U4-10138 2017-07-27 13:37:49 +02: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
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
Stephan
fedd9e2897 Fix User deep-cloning 2017-07-20 16:52:13 +02: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
Stephan
964f3bae60 Optimize start nodes calc 2017-07-19 19:26:25 +02:00
Shannon
5c75285543 U4-8643 Usermanagement - Store password algorithm in Usertable 2017-07-19 20:05:47 +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
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
Shannon
b32325bbaa Adds all change tracking to the BackOfficeIdentityUser ensures values are not persisted that are not changed, adds required null checks, removes internal method GetOrCreateBackOfficeUser 2017-07-19 14:13:42 +10: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
Shannon
73b107ee2a Fixing U4-10138 Cannot upgrade to 7.7 due to user groups and U4-7907 With non OAuth external login providers we should have an 'auto-link' / 'auto-create' callback option 2017-07-18 19:53:34 +10:00
Stephan
945050858e Cleanup 2017-07-18 09:11:12 +02: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
1643eec62c Fixes cache refreshing for user groups since user cache need to be cleared for that too. Updates cache refreshers to use json.net for serializing which is way faster. adds better support for querying multiple user groups and entity ids for permissions, updates tests 2017-07-13 18:47:10 +10:00
Shannon
c472463f37 Removes all user permissions cache refreshing and events and obsoletes assocated clsses 2017-07-13 11:02:34 +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
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
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
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