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

903 Commits

Author SHA1 Message Date
Shannon
d7f2041ee9 Makes the TourFilterResolver a real resolver 2018-01-11 18:00:42 +11:00
Claus
eb94572361 updating pr to fit with base. 2018-01-10 10:55:46 +01:00
Claus
fd8317493e Merge branch 'dev-v7.8' into temp-U4-10707 
# Conflicts:
#	src/Umbraco.Web/Editors/TourController.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2018-01-10 10:10:19 +01:00
Shannon
c3be9004f6 U4-10811 Store custom tours as json and load from App_Plugins/{MyPlugin}/backoffice/tours 2018-01-10 16:01:46 +11:00
Claus
a5ec5f46ac filtering out tours. 2018-01-09 15:49:19 +01:00
Shannon
773ef1d168 Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
 2018-01-02 15:28:30 +11:00
Shannon
e4561851a4 modifies some code changes to null check and not to use extension methods that require singleton access. 2017-12-21 17:30:37 +11:00
m.kilianovskyi
b1a0ca98ea U4-10770 Get all permissions for entity instead of explicit only 2017-12-18 17:50:53 +02:00
Claus
91e658c41c U4-10610 Cannot restore content templates 2017-12-05 10:37:23 +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
Shannon
4f88da2c26 Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2017-11-08 14:51:27 +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
prjseal
10ca1239b6 Format date in backoffice based on Users language 
We have formatted the Created Date and Updated Date using the Current
Culture of the application.
 2017-11-02 13:44:05 +00:00
Shannon
bbe80d882a Simplifies user tour models returned, fixes mapping so it's actually persisted. 2017-11-01 15:45:48 +11: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
Claus
1c883be16b Merge remote-tracking branch 'origin/temp-u4-8409' into dev-v7.8 2017-10-25 12:27:34 +02: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
Stephan
353b8f21cd U4-7317 - select default template 2017-10-17 16:04:31 +02:00
Sebastiaan Janssen
e333f6c628 Merge pull request #2236 from umbraco/temp-U4-10521 
fixes: U4-10521 Creating new folders from the media picker no longer …
 2017-10-16 12:44:32 +02:00
Claus
13055ad1f2 U4-10524 Show warning in UI for any picker that is referencing a trashed or deleted item 
fixing the trash flag not getting mapped via automapper.
fixing up the ui for mediapicker.
fixing a small ui issue with the contentpicker and trashed content.
 2017-10-12 11:35:08 +02:00
Shannon
c5d874464a Fixes PostAddFolder 2017-10-12 17:11:45 +11:00
Shannon
053544a578 Changes the type of MediaItemDisplay.ContentType to be what it should be, removes non-required mapping 2017-10-09 15:02:27 +11:00
Robert
5eb609d8a0 Renamed a few properties and a class 2017-10-03 15:35:36 +02:00
Robert
e643189b10 Moved mediaLink mapping directly to autoMapper 2017-09-28 16:07:16 +02:00
Robert
5517252200 Moved documentType and mediaLink to root node for media section 
Created Map in MediaModelMapper to cater for the new property (DocumentType)
Wired front-end to match the new properties
 2017-09-28 15:21:04 +02:00
Robert
a47b5035fe Merge pull request #2219 from umbraco/temp-U4-10311 
U4-10311 Wire up angular with backend
 2017-09-28 09:10:02 +02:00
Shannon
387faca71e Simplifies the model mapping, uses strongly typed values 2017-09-28 14:54:18 +10:00
Robert
62cda02ded Some clean up in ContentModelMapper.cs 2017-09-27 16:02:32 +02:00
Robert
2e1e2e4325 Properties tab will be removed if it has no properties 2017-09-27 13:58:33 +02:00
Robert
4a9e326267 Remove the rest of umb properties 2017-09-27 09:28:51 +02:00
Robert
67edc6cf9a Deleted updateDate, createDate and createdBy from properties tab 2017-09-26 15:57:50 +02:00
Robert
e740838ef7 Moved template and docType from properties tab to root node and linked the values back together in front-end 2017-09-26 15:44:41 +02:00
Robert
dec44b1288 Moved templateConfig to root node 2017-09-26 09:20:38 +02:00
Robert
116e53e07d Custom serialization attribute added to AuditType property 2017-09-19 11:49:32 +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
Mads Rasmussen
29f3acc23e Merge pull request #2163 from umbraco/temp-U4-10275 
U4-10275 Render 'site' nodes for the content/media trees for users with non root access
 2017-09-10 18:04:59 +02:00
Shannon
5398d24f58 disables deleting translator group 2017-09-08 16:07:58 +10:00
Shannon
81ba2069af fixed media start node mapping for user 2017-09-08 15:11:39 +10:00
Shannon
bc148d08fa maps avatars in log 2017-09-07 22:24:18 +10:00
Shannon
c7b9a57795 U4-10382 Add end point to get a paginated audit trail 2017-09-07 17:27:37 +10:00
Shannon
f3f31f2569 Gets invite and create user working with new setting and allowing specifying a separate username. 2017-09-05 23:31:26 +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
a608577a4f Merge branch 'dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Core/Security/BackOfficeUserStore.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2017-09-04 16:51:20 +10:00
Shannon
6995c184e3 Updates user editor, non-admins can see all user groups but cannot edit them, they can save user that contain groups that they don't have access to if they were already there but cannot add new ones they dont' have access to 2017-08-29 01:00:08 +10:00
Shannon
c5e1fc5a20 U4-10348 Show readonly user profile information on user editor 2017-08-23 15:45:42 +10:00
Shannon
a50386aaf1 fixes test 2017-08-17 14:36:52 +10:00
Claus
028576d93c Merge pull request #2120 from umbraco/temp-U4-10227 
U4-10227 Users section should start in the user tree
 2017-08-11 10:31:20 +02:00
Shannon
97f2b40f4b fixes tests 2017-08-10 17:59:17 +10:00
Shannon
72495b3eaf U4-10227 Users section should start in the user tree 2017-08-10 17:25:16 +10:00