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

364 Commits

Author SHA1 Message Date
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
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
Shannon
ff6ea0b42e Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310 
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
 2017-02-01 15:23:29 +11:00
Shannon
384a31e3c6 Gets member picker working with UDI, ensures that the GUID is indexed for all things - can't believe this wasn't being done, updates the search model mapper to return the UDI 2017-02-01 15:19:52 +11:00
Per Ploug
b05c4711ce Fixes tree syncing issues 2017-01-30 13:33:05 +01:00
Claus
74c167ed03 U4-9413 moving links to document and media to top of generic properties. 2017-01-30 13:18:30 +01:00
Shannon
9ef53536bf Updates the base editor models to include a readonly UDI, updates all model mappers to map the UDI, 2017-01-28 01:14:24 +11:00
Shannon
547351a719 Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310 2017-01-28 00:25:25 +11:00
Shannon
a5af5ba1a9 Adds new property to PropertyEditor's to mark them as deprecated so they don't show up in the data type list unless they are already selected 2017-01-17 18:54:50 +11:00
Niels Hartvig
a162f21a70 Fixing missing mapping - let the green build lights appear 2017-01-16 19:49:57 +01:00
Niels Hartvig
ace111aefb Adding support for get, save and rename to new Partial View editor 2017-01-16 16:50:22 +01:00
Niels Hartvig
e7f7631d1e Fixes merge conflicts (needs updated ng-if in insert overlay) 2017-01-13 13:22:43 +01:00
Warren Buckley
5041a459d4 Merge pull request #1681 from umbraco/temp-template-editor 
Temp template editor
 2017-01-12 15:56:08 +00:00
Per Ploug
f036bc90c3 Fixes failing mapper test 2017-01-10 16:54:46 +01:00
Niels Hartvig
5a2687d520 Merge of temp-template-editor 2017-01-10 14:47:33 +01:00
Niels Hartvig
4c330c8654 Implements CodeFileController 2017-01-09 22:54:28 +01:00
Sebastiaan Janssen
770f96b6d5 Merge branch 'dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
 2017-01-05 09:47:51 +01:00
Shannon
790e30defd Simplifies all creation of UrlHelper, creates GetUmbracoApiServiceBaseUrl extensions for WebApi 2017-01-03 11:13:38 +11:00
Brian Powell
afa39866ad Fix U4-9298 2016-12-17 21:12:45 -05:00
Stephan
d800a4198d fix meh 2016-11-15 09:14:55 +01:00
Mads Rasmussen
f6d8a980a6 Merge branch 'dev-v7' into temp-template-editor 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-11-14 11:04:15 +01:00
Claus
ff2805c428 mostly just formatting and cleanup - no changes as such. 2016-11-09 11:13:35 +01:00
Claus
69c45a4b05 Merge pull request #1612 from tnielsenskybruddk/dev-v7 
Link to member type from member properties
 2016-11-09 10:29:49 +01:00
Thomas Nielsen
cbfd04e950 Link to member type from member properties 2016-11-08 23:37:29 +01:00
Thomas Nielsen
981c0b83d3 Oops wrong pull request 2016-11-08 23:16:10 +01:00
Thomas Nielsen
16ae5cf634 Link to member type from member properties 2016-11-08 23:00:14 +01:00
Thomas Nielsen
ea67e21796 Link to mediatype from media properties 2016-11-02 21:20:03 +01:00