Commit Graph

726 Commits

Author SHA1 Message Date
Claus
91e658c41c U4-10610 Cannot restore content templates 2017-12-05 10:37:23 +01:00
Stephan
9b9c7c8e3a Refactor content service 2017-11-30 13:57:40 +01:00
Stephan
ef11fda272 More content refactoring (tests) 2017-11-15 08:53:20 +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
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
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
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
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
Stephan
e71c9740cd More SqlTemplates 2017-09-24 18:54:31 +02:00
Stephan
5ba2ffcbf3 CrLfTab 2017-09-23 10:08:18 +02:00
Stephan
dca3b74542 Refactor and fix tests 2017-09-20 20:06:46 +02:00
Stephan
1341a37f2b Cleanup Constants.ObjectTypes 2017-09-19 18:19:05 +02:00
Stephan
9ed6576908 Port 7.7 - WIP 2017-09-19 15:51:47 +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
Stephan
4634eb28e7 Port 7.7 - WIP 2017-09-14 11:41:46 +02:00
Stephan
37171d96bc Port 7.7 - WIP 2017-09-13 17:35:20 +02:00
Stephan
96c08f24ee Port 7.7 - WIP 2017-09-12 16:22:16 +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
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
Claus
73bc5c6ec9 changes needed for blueprints to differentiate them from content items. 2017-08-09 15:29:12 +02:00
Shannon
2e6fb8e3e5 Fixes merge issues, ensures "Content root" and "Media root" are localized 2017-08-01 12:41:22 +10:00
Shannon
bcf4a84725 fixes more tests, gotta be close now 2017-07-31 19:47:02 +10:00
Stephan
b10d370b16 Merge branch dev-v7.7 into user-group-permissions 2017-07-28 12:54:13 +02:00
Stephan
fdf206038a Merge branch user-group-permissions into temp-U4-10138 2017-07-27 13:37:49 +02:00
Stephan
a0fe56ee7c Rename UmbracoExamine to Umbraco.Examine 2017-07-27 12:01:38 +02:00
Shannon
6d9190bdb3 ensures all built in groups have -1 as start nodes for media, fixes automapper tests 2017-07-26 17:24:26 +10:00
Shannon
17d17cfb82 Puts back in some old APIs that were removed to maintain some backwards compat with < 7.7 for users 2017-07-25 18:39:23 +10:00