yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,778 Commits 4 Branches 7 Tags
57bd5178f74c277b45c352dc67fcd63ed0f1a451
Commit Graph

5118 Commits

Author SHA1 Message Date
Shannon
57bd5178f7 Gets proper paging and filtering working for users 2017-05-17 21:40:17 +10:00
Shannon
9bb880f195 Starts getting the user service/repo to do paging filtering nicely 2017-05-17 19:47:16 +10:00
Shannon
4f80902ac2 Fixes unit tests - all but one 2017-05-16 17:17:02 +10:00
Shannon
26b8236eea fixes user query relator 2017-05-16 16:09:01 +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
faa6a229e6 Updates UserGroupRepository to ensure that it persists things int he correct order and inside of a transaction, removes new code that is already obsolete, fixes tests 2017-05-15 20:27:40 +10:00
Shannon
9b50d6d251 Gets a few tests fixed 2017-05-11 20:51:31 +10:00
Shannon
84c7f5046e Fixes the user group queries to be sorted since the relator requires this 2017-05-11 15:15:46 +10:00
Shannon
d2d6b6654a Adds models and methods for the UserController 2017-05-11 13:11:41 +10:00
Shannon
1ea06930f4 fixes some tests 2017-05-10 21:34:35 +10: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
f594006b95 fixes db table order 2017-05-10 18:07:39 +10:00
Shannon
fc58c4f546 bumps version updates a few methods 2017-05-10 18:06:46 +10:00
Shannon
8f69efe331 It builds! 2017-05-04 19:16:52 +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
Mads Rasmussen
53ef2e356a add new temp users tree 2017-05-03 09:30:29 +02:00
Shannon
c1853e8c51 bumps version to 7.6.0 rtm 2017-05-02 13:42:20 +10:00
Shannon
d9b507c947 bumps version to RC4 so we can build new dependencies against forms/deploy 2017-04-30 23:26:04 +10:00
Shannon
004e00599d Fixing nuget package issues , semver 2 is only for 452+ which we dont have, we shouldnt be using it and it adds more dependencies that we don't need right now 2017-04-30 23:19:45 +10:00
Shannon Deminick
3509a2c40f Merge pull request #1908 from umbraco/temp-scope-events-stale-entities 
POC to normalize all event entities when we track events so that all …
 2017-04-30 19:28:19 +10:00
Shannon
d64fa7f92d Fixes tests, ensures we null check when generating hashes for items in a collection 2017-04-30 19:14:36 +10:00
Stephan
ea14170272 minor cleanup 2017-04-30 10:14:48 +02:00
Sebastiaan Janssen
660f048b4f U4-9812 FailedLoginAttempts should be reset to 0 after a successfull login attempt 
(cherry picked from commit 3242b31a8a)
 2017-04-29 10:22:57 +02:00
Stephan
72eddca3c6 Merge branch 'dev-v7.6' into temp-scope-events-stale-entities 2017-04-28 19:19:36 +02:00
Stephan
efc3261163 scope - dont break 2017-04-28 11:43:48 +02:00
Stephan
8c6aa9875d scope - dont rename 2017-04-28 11:26:41 +02:00
Stephan
f89ce1ff26 scope - cleanup 2017-04-28 10:58:57 +02:00
Shannon
1274fbaefd Fixes up the equality members for the event args types to include Gethash code and sequence equal checking, this is done by a base class used by event args that deal with collections. 2017-04-28 18:14:50 +10:00
Shannon
8140dfdc04 ads notes 2017-04-28 16:57:13 +10:00
Shannon
a69eba61c8 Fixes detecting enumerable and ensures that the event is added to the result if we can't cast to IEntity 2017-04-28 14:54:08 +10:00
Shannon
0b61685fc8 Adds ability to supersede events so we don't have an issue of saved event being raised for an entity after it's been deleted. 2017-04-28 13:26:56 +10:00
Shannon
3779b3c782 Updates base entities to contain a DeletedDate if the entity gets deleted 2017-04-28 11:15:19 +10:00
Shannon
9cd7e09986 POC to normalize all event entities when we track events so that all args contain the latest (non stale) entity 2017-04-28 10:04:43 +10:00
Shannon
9f505a7976 bumps to rc3 version 2017-04-28 08:27:31 +10:00
Shannon Deminick
d8b235ad62 Merge pull request #1906 from umbraco/temp-CON-1267 
CON-1267 Update Our to not offer v6 to people on < 7.6.0
 2017-04-28 07:52:19 +10:00
Shannon
c629a50f39 Fixes entity service and figuring out which GUID to go with which object type 2017-04-27 13:29:31 +10:00
Shannon
430f906ae6 Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267 2017-04-27 13:28:34 +10:00
Shannon
e913034d93 Changes PackagingService to not have a different base class since it was not needed 2017-04-27 13:21:56 +10:00
Stephan
0291ab615d Fix shadow wrapper cleanup 2017-04-26 17:38:06 +02:00
Stephan
ceeea7827e Fix shadow wrapper cleanup 2017-04-26 14:44:48 +02:00
Shannon
756b4d24c0 Updates endpoint to include hidden package files 2017-04-26 22:10:34 +10:00
Stephan
ffe3fc9257 deploy-293 - fix normalization 2017-04-26 13:25:54 +02:00
Shannon
26bd3c7c0b removes unneeded closing of stream since it's disposed 2017-04-26 19:42:58 +10:00
Shannon
944b3dcaac New method for IPackagingService to fetch a package from the repo, removes usages of the old repo endpoint, removes ability to push a package from the back office to Our since that would require a different endpoint. 2017-04-26 19:02:36 +10:00
Shannon
a6f9d14a1b Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267 2017-04-26 14:18:05 +10:00
Shannon
bfb81f6362 Allows for the umb pckage repo rest api endpoint to be configurable - for testing 2017-04-26 14:04:47 +10:00
mikkelhm
4775aff749 Bump version to RC2 2017-04-25 11:15:51 +02:00
Warren Buckley
a9b820de31 Merge branch 'dev-v7.6' into temp-U4-9758 2017-04-25 09:58:20 +01:00
Stephan
3813653852 deploy-293 - only if not already 7.6 2017-04-25 10:46:37 +02:00
Warren Buckley
a4720a2221 Adds null check - So that we still add the index if we don't have any member entries as of yet 2017-04-25 09:13:48 +01:00