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

1162 Commits

Author SHA1 Message Date
Shannon
e25f6e82ed Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
 2018-01-23 11:42:14 -07:00
Stephan
3ff455f11d U4-10079 - remove default template 2018-01-17 11:36:08 +01:00
Claus
ae07f34215 seems this was missing from the merge commit? 2017-12-13 09:53:38 +01:00
Claus
91e658c41c U4-10610 Cannot restore content templates 2017-12-05 10:37:23 +01:00
Claus
0ce7efc978 U4-10610 Cannot restore content templates 2017-12-05 10:19:12 +01:00
Shannon
0f3a76809b Merge branch 'dev-v7.8' into temp-U4-10305 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
 2017-11-08 14:52:21 +11:00
Robert
9b7a9fc988 Merge remote-tracking branch 'origin/temp-U4-5896-2' into dev-v7.8 2017-11-03 15:38:08 +01:00
Claus
49356b31a1 Merge branch 'dev-v7.8' into temp-U4-10286 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
 2017-11-03 14:08:46 +01:00
Robert
d02139bbcd Merge pull request #2273 from umbraco/temp-U4-9120 
U4-9120 Add instruction count column on the db instructions table
 2017-11-03 10:20:57 +01:00
Shannon
8a19b97900 removes unneeded mapping 2017-11-03 18:23:56 +11:00
Shannon
782d6100f0 Gets user session management tracking via the database including detecting stale sessions, generating and removing them along with cleaning them up. This takes into account legacy code too. The session is revalidated on a one minute threshold per user so that it's not hammering the databse on every request. 2017-11-03 17:27:23 +11:00
Shannon
5b19d5e0d8 WIP on login ids 2017-11-02 15:04:54 +11:00
Claus
7c21889239 fixing comment causing confusion. 2017-11-01 19:41:50 +01:00
Shannon
408ec17201 Merge branch 'temp-U4-10305' into temp-U4-10601 2017-11-01 15:25:50 +11:00
Shannon
8208f8de51 Updates codebase to store tour data for a user in the user table, adds new column to store json and adds migration to create the column 2017-11-01 15:11:13 +11:00
Shannon
6462329494 U4-9120 Add instruction count column on the db instructions table 2017-10-31 11:54:08 +11:00
Shannon
891bea81bf bumps version and updates DatabaseSchemaResult to check for cmsMedia table, fixes the bulk insert logic to ignore result columns 2017-10-31 11:20:01 +11:00
Shannon
e3e88b3679 Gets the media path being stored in the db, the column is indexed and so is the property type alias, tests are passing for the lookup 2017-10-31 11:20:01 +11:00
Shannon
5dc993890d New cmsMedia database table to track media by media paths for fast lookups 2017-10-31 11:20:01 +11:00
Claus
73d681d674 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
 2017-10-25 11:52:30 +02:00
Shannon
de17b69564 U4-10452 Unable to create new User Groups programmatically - publicizes UserGroup 2017-10-09 16:07:55 +11:00
Mads Rasmussen
0da8644e77 Merge branch 'dev-v7' into temp-U4-10309 2017-09-29 09:55:32 +02:00
Sebastiaan Janssen
83f705e19f Merge branch 'dev-v7' into temp-U4-10437 2017-09-28 20:07:27 +02:00
Shannon
4053c52dfb U4-10437 Listview children not showing after upgrade to 7.7 2017-09-27 22:17:50 +10:00
Sam Sperling
201ac076c3 Fix for: U4-10444 - External Logins have stopped working since the 7.7.1 update when using auto linking 2017-09-22 13:55:15 +10:00
Sebastiaan Janssen
3f82781c0f Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-14 16:15:43 +02:00
Mads Rasmussen
5330830362 Merge branch 'dev-v7.7' into temp-U4-10309 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
 2017-09-14 15:28:21 +02:00
Sebastiaan Janssen
f3fc2bcfb8 Merge pull request #2177 from umbraco/temp-U4-10384 
U4-10384 Error when changing content type on media item
 2017-09-14 13:46:32 +02:00
Shannon
703c3eefe8 Fixes issue with trying to log in as a user that is disabled. 2017-09-14 19:00:59 +10:00
Sebastiaan Janssen
dd440eb9d5 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
 2017-09-13 12:09:17 +02:00
Claus
0700e37830 adding unit tests for urls. 
adding unit test for creating child content without identity.
cleaning up some usings ...
 2017-09-12 14:44:01 +02:00
Shannon
504f32f25b Merge branch 'dev-v7.7' into temp-U4-10275 2017-09-08 13:53:02 +10:00
Shannon
6ea92daa70 fixes merge removes unused file 2017-09-07 23:03:01 +10:00
Shannon
65ece33ca9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
#	src/Umbraco.Web.UI.Client/src/installer/_module.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
 2017-09-07 22:43:03 +10:00
Shannon
bc148d08fa maps avatars in log 2017-09-07 22:24:18 +10:00
Claus
598944d3d8 ensuring id is only set if unset. 2017-09-07 13:13:03 +02:00
Claus
3caecf5161 U4-10384 Error when changing content type on media item 2017-09-07 12:57:06 +02:00
Shannon
c7b9a57795 U4-10382 Add end point to get a paginated audit trail 2017-09-07 17:27:37 +10:00
Claus
63b2d10e86 Merge pull request #2164 from umbraco/temp-U4-10374 
U4-10374 EntityService, ContentService and MediaService should use a …
 2017-09-06 09:12:12 +02:00
Shannon
8b17d69d32 Merge branch 'temp-U4-10389' into temp-U4-10275 2017-09-06 12:03:55 +10:00
Shannon
8ad1d247fa U4-10389 Some webforms editors do not authorize on the user's path access or permissions set for the editing node 2017-09-06 11:49:00 +10:00
Shannon
c860069215 Updates logic to ensure that if we are rendering site nodes that we don't render all of their children, we will filter out any nodes that do not belong to the user's start nodes' branches 2017-09-06 00:38:31 +10:00
Shannon
186fd1166a Merge branch 'dev-v7.7' into temp-U4-10275 2017-09-05 23:48:11 +10:00
Stephan
e7c231c5a8 Support IdReservation in IdkMap 2017-09-05 15:23:18 +02:00
Shannon
8ff89c4f48 U4-10385 Examine indexing performance bottleneck: IUserService.GetProfileById which is not cached 2017-09-05 16:41:06 +10:00
Shannon
7926a0c676 Simplifies the change password logic with the back office so an admin user can easily change another user's password if they have access to the users section. Updates the controllers to populate the modelstate correctly, changes name of HasAppAccess to HasSectionAccess. Ensure we don't have duplicate ysod dialogs when there is an error. 2017-09-04 22:03:03 +10:00
Shannon
1cec38c679 Gets site nodes showing for users with multiple root nodes and updates UI to support showing them what they have and don't have access to, also updates the content/media tree controllers performance for when looking up entities and if the user has access to the path. 2017-09-01 00:32:01 +10:00
Shannon
13e2112c3c U4-10361 Creating new member when AllowManuallyChangingPassword="false" - can't set a password 2017-08-29 11:56:38 +10:00
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