121036ebb9
Merge branch 'dev-v7.7' into user-group-permissions
...
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Umbraco.Web.csproj
2017-06-05 10:35:23 +02:00
e2f9c90dc6
Merge branch 'dev-v7.7' into temp-content-blueprints
2017-06-05 10:23:10 +02:00
7d1aedc0d3
fixes unit tests
2017-06-05 10:17:18 +02:00
942d010264
Retreat Amazing Nested Content Work
2017-06-05 09:28:52 +02:00
b99b9b7a6b
adds blueprints dictionary to ContentTypeBasic result
2017-06-04 17:31:31 +02:00
6cd52bbc3c
Gets user invite generating the token, sending the email and then verifying the token
2017-05-29 15:55:36 +02:00
7f27745d27
starting to get the invite email with token working
2017-05-29 09:36:07 +02:00
f493c254e8
Fixes up the users login date on the user list view, fixes tests
2017-05-26 12:47:31 +10:00
362b98509b
Updates path check to use all assigned user start nodes that are combined by their groups and directly assigned values
2017-05-26 12:09:06 +10:00
4337036358
refactor users and how groups are added to them so we can know dynamically start nodes, etc... fixes tests
2017-05-26 11:17:06 +10:00
8aabb3e3d0
wires up custom user avatars
2017-05-26 02:15:37 +10:00
528be48437
Adds UsersController.SetAvatar and ClearAvatar
2017-05-26 00:02:32 +10:00
a8220e0f62
gets user saving working
2017-05-25 12:17:32 +10:00
dec9422531
Updated DB and business logic to support multiple starts nodes for a user and for user groups to have start nodes - U4-9915 User Groups will have a start node assigned and Users can have multiple start nodes assigned
2017-05-25 02:03:41 +10:00
38837049f0
adds invite user endpoint with a controller test!
2017-05-24 19:01:01 +10:00
0cca342b83
updates user groups to contain the correct db columns for start nodes, updates mappings, fixes tests.
2017-05-23 15:48:08 +10:00
45fa106c42
Adding required user group db columns and models, fixing tests
2017-05-23 15:23:10 +10:00
517dc3abe3
updates more user properties
2017-05-22 21:23:04 +10:00
fcc71958e3
Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions
...
# Conflicts:
# .gitignore
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx
2017-05-19 09:59:59 +10:00
765decf3b1
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7
...
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
# src/Umbraco.Web/Trees/PartialViewsTree.cs
2017-05-17 20:00:29 +10:00
225f657154
fixes tests for mappings
2017-05-16 18:18:10 +10:00
ffd63a9103
fixes merge issues
2017-05-16 15:51:30 +10:00
bb436426a4
Merge remote-tracking branch 'origin/temp-U4-9776' into temp-U4-8632
...
# Conflicts:
# src/Umbraco.Web.UI/config/trees.config
2017-05-16 15:19:45 +10:00
d2d6b6654a
Adds models and methods for the UserController
2017-05-11 13:11:41 +10:00
d8811d6b46
Refactored code for FIPS compliance support. Added/converted to using a more generic Hash() method instead of directly using MD5.
2017-05-10 13:35:28 -07:00
512f3237f0
larger refactor so we don't need to worry about 'loading' a users groups, it will all just be done, updated queries to fetch a user, it's groups and it's sections all at once, it might be a little heavy but we'll see. Adds/removes a few other methods that didn't seem right and uses group aliases for most things, adds Datbase unique indexes for group aliases and names (need to fix tests though)
2017-05-10 21:00:30 +10:00
24e2547656
Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b
...
# Conflicts:
# src/Umbraco.Core/Models/Rdbms/UserGroup2NodePermissionDto.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
# src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
# src/Umbraco.Core/Persistence/RepositoryFactory.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/SectionService.cs
# src/Umbraco.Core/Services/UserService.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
# src/Umbraco.Tests/Services/ContentServiceTests.cs
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.UI/config/trees.config
# src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
# src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
2017-05-04 18:29:43 +10:00
ec9020f63e
Fixes mappings
2017-04-28 13:34:32 +10:00
b88e714050
Fixed Serialization issue in Password Reset Validate Model
2017-04-21 08:33:21 +02:00
d19bebc404
Merge branch 'dev-v7.6' into temp-U4-7009
2017-04-18 20:10:27 +10:00
46dd86c745
Moves logic for checking if the current user (based on the current thread) is an admin and in which case can reset the password to an extension method
2017-04-18 20:09:27 +10:00
e2dc4f36ad
U4-9762 ezSearch package complains about pickers in macro parameters
2017-04-12 13:39:38 +02:00
8d8bb4e237
fix HasImage()
2017-03-31 17:24:18 +02:00
cb539e82d0
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
...
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
# src/UmbracoExamine/UmbracoMemberIndexer.cs
2017-03-29 18:11:51 +11:00
77af16db55
Merge branch 'dev-v7' into temp-u4-9617
...
# Conflicts:
# src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
2017-03-29 16:29:18 +11:00
a9fe46da0c
makes HasContainerInPath public
2017-03-28 15:55:45 +11:00
a23c150738
U4-9617 - fix
2017-03-23 17:51:30 +01:00
085a678266
U4-9617 - perf for published date
2017-03-23 17:44:07 +01:00
fe11d4770d
U4-9615 - implement way to find listviews in path fast
2017-03-23 14:07:45 +01:00
1bfb63fe86
Adds validation for file names
2017-03-21 18:35:13 +11:00
7b506fadc6
U4-9611 - minor fix
2017-03-16 14:35:54 +01:00
e1942d96d0
Incorporate Stephane's feedback: if we already know we're getting list of int or udi, we don't need to cast, or even test for the PropertyEditorAlias
2017-03-15 23:22:53 +01:00
a2ca753dd9
Use RelatedLink class instead of weird extra inline class, convert UDI values
2017-03-14 10:26:13 +01:00
05f8870424
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
2017-03-14 17:25:40 +11:00
1b7ce8bcde
Removed weird comment
...
removed "this" as remark for NewPassword
2017-03-12 21:20:24 +01:00
5291558b23
Further refactoring, using attributes, moving and removing some classes, using DI where necessary.
2017-03-08 14:27:39 +01:00
a9c5877e5b
Merge branch 'refs/heads/dev-v7.6' into temp-u4-7318
...
# Conflicts:
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web/Umbraco.Web.csproj
2017-03-01 15:04:00 +01:00
d3582e2296
An ID is required on all items edited in backoffice editors
...
The ID is required when an item is saved, as the routing will
automatically redirect based on this ID - files, does not have an ID -
so the filepath is used in the same as it is used for the tree
2017-02-22 15:47:36 +00:00
b4eb9f333e
Gets the member picker working with mini list views, falls back to Examine search for when searching on member types - since the EntityService doesn't support that currently, gets the icon mapped correctly for members,
2017-02-21 13:49:58 +11:00
6ae06ad2e0
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9470
...
# Conflicts:
# src/Umbraco.Web/Editors/EntityController.cs
2017-02-15 17:41:12 +11:00
Shannon