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

489 Commits

Author SHA1 Message Date
Shannon
f09f17e496 getting email invite working and with identity apis 2017-06-13 18:38:16 +02:00
Shannon
716629235e issue with mapping ysod 2017-06-13 15:47:39 +02:00
Claus
160518e977 adding guids to backoffice. 2017-06-12 12:12:14 +02:00
Shannon
174e336512 fixes sections 2017-06-06 02:13:14 +02:00
Shannon
9bf61bb487 real data for user group 2017-06-06 02:05:17 +02:00
Shannon
7533b0e704 ensures icons, ensures saving info for creating users 2017-06-06 01:21:03 +02:00
Shannon
f907385ac8 fix mapping issue 2017-06-06 01:06:19 +02:00
Shannon
bbda93a06b updates mapping for start nodes 2017-06-06 00:49:36 +02:00
Shannon
76032cf5f7 maps name and icon for user groups 2017-06-06 00:13:46 +02:00
Shannon
64975166e7 updates user models 2017-06-06 00:02:23 +02:00
Shannon
2ee34d5c48 updates user models 2017-06-05 23:25:33 +02:00
Shannon
7d1aedc0d3 fixes unit tests 2017-06-05 10:17:18 +02:00
Shannon
b99b9b7a6b adds blueprints dictionary to ContentTypeBasic result 2017-06-04 17:31:31 +02:00
Shannon
106a06be2a Gets templates working 2017-05-31 13:09:26 +02:00
Shannon
a70c9226fc Updates lots of trees for searching and gets results grouped 2017-05-31 12:25:05 +02:00
Shannon
3ae16e717c Merge branch 'dev-v7-pluggable-ISearchableTree' of https://github.com/efabioli/Umbraco-CMS into efabioli-dev-v7-pluggable-ISearchableTree 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
 2017-05-30 00:48:41 +02:00
Shannon
6cd52bbc3c Gets user invite generating the token, sending the email and then verifying the token 2017-05-29 15:55:36 +02:00
Shannon
7f27745d27 starting to get the invite email with token working 2017-05-29 09:36:07 +02:00
Shannon
f493c254e8 Fixes up the users login date on the user list view, fixes tests 2017-05-26 12:47:31 +10:00
Shannon
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
Shannon
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
Shannon
8aabb3e3d0 wires up custom user avatars 2017-05-26 02:15:37 +10:00
Shannon
528be48437 Adds UsersController.SetAvatar and ClearAvatar 2017-05-26 00:02:32 +10:00
Shannon
a8220e0f62 gets user saving working 2017-05-25 12:17:32 +10:00
Shannon
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
Shannon
38837049f0 adds invite user endpoint with a controller test! 2017-05-24 19:01:01 +10:00
Shannon
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
Shannon
45fa106c42 Adding required user group db columns and models, fixing tests 2017-05-23 15:23:10 +10:00
Shannon
517dc3abe3 updates more user properties 2017-05-22 21:23:04 +10:00
Shannon
225f657154 fixes tests for mappings 2017-05-16 18:18:10 +10:00
Shannon
ffd63a9103 fixes merge issues 2017-05-16 15:51:30 +10:00
Shannon
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
Shannon
d2d6b6654a Adds models and methods for the UserController 2017-05-11 13:11:41 +10:00
Jason Prothero
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
Shannon
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
Shannon
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
Shannon
ec9020f63e Fixes mappings 2017-04-28 13:34:32 +10:00
Shannon
d19bebc404 Merge branch 'dev-v7.6' into temp-U4-7009 2017-04-18 20:10:27 +10:00
Shannon
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
Sebastiaan Janssen
e2dc4f36ad U4-9762 ezSearch package complains about pickers in macro parameters 2017-04-12 13:39:38 +02:00
Shannon
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
Shannon
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
Shannon
a9fe46da0c makes HasContainerInPath public 2017-03-28 15:55:45 +11:00
Stephan
a23c150738 U4-9617 - fix 2017-03-23 17:51:30 +01:00
Stephan
085a678266 U4-9617 - perf for published date 2017-03-23 17:44:07 +01:00
Stephan
fe11d4770d U4-9615 - implement way to find listviews in path fast 2017-03-23 14:07:45 +01:00
Shannon
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
Shannon
179523224a Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310 2017-02-07 12:15:54 +11:00
Shannon
db86f6e1ee Fixes up issues reported on review and adds a null check 2017-02-03 11:49:22 +11:00
Claus
46c7737c17 Merge pull request #1714 from umbraco/temp-u4-9441 
Fixes tree syncing issues
 2017-02-01 14:04:18 +01:00