yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,830 Commits 4 Branches 7 Tags
4134dd16df02151ced2bb566c284b87b9ec8ec15
Commit Graph

846 Commits

Author SHA1 Message Date
Shannon
4134dd16df adds fixme note 2019-07-02 12:04:58 +10:00
Shannon
ba7cd48b8f Merge remote-tracking branch 'origin/v8/dev' into v8/merge/v715 
# Conflicts:
#	src/Umbraco.Core/Constants-DataTypes.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
 2019-07-02 10:49:20 +10:00
Shannon
80e6880bb7 more manual merging - getting anchors back in tinymce 2019-07-01 16:22:54 +10:00
Shannon
4a33ca99ba More manual merging 2019-06-28 15:03:52 +10:00
leekelleher
580ba79619 Icon Constants consistency 
Updated the `Constants.Icons` and replaced the hard-coded strings with
 the const references.
 2019-06-27 22:35:29 +02:00
Bjarke Berg
acbe82f4c8 Merge pull request #5688 from umbraco/v8/bugfix/expand-tree-fix 
Feature in v7 based on #2682 that wasn't merged upwards to v8
 2019-06-27 07:53:15 +02:00
Shannon
ef714ac258 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/5170-IPublishedContent 
# Conflicts:
#	src/Umbraco.Web/UmbracoHelper.cs
 2019-06-27 14:44:33 +10:00
Bjarke Berg
fbf3015de4 Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/expand-tree-fix 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
 2019-06-26 14:38:19 +02:00
Andy Butland
9fffdb407a Provided alternative messages for users that do and do not have access to document/media types for when trying to create content or media and no types can be created. 
Where they do, provided a link to go to the page where child nodes can be edited.
 2019-06-23 13:02:15 +02:00
Shannon
c2cb85f1cd Merge branch 'v8/dev' into v8/feature/5170-IPublishedContent 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
 2019-06-21 15:06:43 +10:00
Niels Lyngsø
23702ee4dc Fixes notifications issue for new variant saving, allows "soft redirect" for creating (#5646) 
Fixes notifications issue for new variant saving, allows "soft redirect" for creating
 2019-06-19 12:34:33 +02:00
Shannon
5c2b0647f3 Gets the feature in v7 based on #2682 that wasn't merged upwards to v8 and found some issues along the way like not filtering the mini list view properly along with not returning the content type alias in the entity controller 2019-06-19 16:42:04 +10:00
Shannon
81077c2681 Gets the entity service returning a media's url property and allows this to be used in the media picker. 2019-06-13 23:39:36 +10:00
Shannon
1f64ae4682 Fixes language/variant mapping so it's consistent and by lang name not iso 2019-06-11 17:17:19 +10:00
Shannon
120f4c3096 removes scope.busy callls (legacy old stuff), add ability to preserve editor state between routes, for content we now preserve editor state when redirecting to new content and then rebind some values from that editor state when the editor loads, updates editorstate.service and filemanager.service to manage themselves on route change (decoupling), fixes variant mapper to ensure that the variants are always returned in a deterministic order. 2019-06-11 16:31:32 +10:00
Stephan
1dde60a1d5 Merge branch v8/dev into v8/feature/5170-IPublishedContent 2019-06-06 12:12:49 +02:00
Sebastiaan Janssen
fef9248b51 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html
#	src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
#	src/Umbraco.Web/Strategies/NotificationsHandler.cs
 2019-05-31 11:36:29 +02:00
Sebastiaan Janssen
6af1057ad7 Merge pull request #5508 from Geckex/v7/temp-5507 
MemberModelMapper to return member groups ordered alphabetically
 2019-05-30 17:38:53 +02:00
Thomas Poulsen
50c2d574f1 Change MemberModelMapper GetMemberGroupValue to return member groups ordered alphabetically. 
- This is used in ContentPropertyDisplay class - for UI purposes only.
 2019-05-22 14:13:46 +01:00
Stephan
bb0331e9cc Move IPublishedContent.Url() to ext method 2019-04-24 14:25:41 +02:00
Kenn Jacobsen
717f8c9944 Fix mapping for search results 2019-04-21 21:00:34 +02:00
Bjarke Berg
b29fd4ada3 Merge pull request #5192 from umbraco/v8/bugfix/5183-mapping-enumerables 
Fix mapping of enumerable
 2019-04-09 11:51:39 +02:00
Stephan
6c8ded6275 Better mapping of enumerable 2019-04-08 16:41:33 +02:00
Stephan
c4db0a3dc1 Merge pull request #5188 from kjac/v8-fix-relationtype-map-alias 
V8: Relation type alias is "generating" when editing an existing relation type
 2019-04-08 14:32:24 +02:00
Stephan
9eb1415796 Fix mapping of enumerable 2019-04-08 10:05:21 +02:00
Stephan
091fae39a3 Merge pull request #5177 from kjac/v8-fix-entityslim-additionaldata-mapping 
V8: Missing "metadata" breaks media picker (mapping issue)
 2019-04-08 08:59:07 +02:00
Kenn Jacobsen
22f43e67f5 Include relation type alias when mapping to RelationTypeDisplay 2019-04-07 20:13:39 +02:00
Stephan
ce89aa4857 Minor mapping fix 2019-04-07 12:56:11 +02:00
Stephan
6aeea47f6f Minor fix 2019-04-07 11:27:34 +02:00
Stephan
8049c40f90 Stop exposing mapper in MapperContext 2019-04-07 11:26:47 +02:00
Stephan
1af431a27d Merge pull request #5181 from kjac/v8-fix-variant-listview 
V8: Fix YSOD on variant content listview
 2019-04-07 10:34:01 +02:00
Stephan
814b8e3b7d Merge pull request #5180 from kjac/v8-fix-save-variant-content 
V8: YSOD when saving variant content (mapping issue)
 2019-04-07 10:29:37 +02:00
Kenn Jacobsen
9326aac6d3 Pass the mapping context when mapping properties, to ensure that variant properties are mapped according to the current language context 2019-04-06 21:53:40 +02:00
Kenn Jacobsen
cb921b1fe2 Pass the mapping context when mapping properties, otherwise variant properties can't be mapped due to missing culture in mapping context 2019-04-06 21:39:16 +02:00
Stephan
0a4465f721 Fix mapping comment 2019-04-06 18:35:07 +02:00
Stephan
9c06ef83e2 Merge pull request #5176 from kjac/v8-fix-map-usergroup-assignedusergrouppermissions 
V8: Fix node permissions YSOD (mapping issue)
 2019-04-06 18:33:04 +02:00
Kenn Jacobsen
f5ad4c67eb Include AdditionalData when mapping IEntitySlim to EntityBasic 2019-04-06 12:24:41 +02:00
Kenn Jacobsen
851f74528f Include UserGroup ID when mapping UserGroup to AssignedUserGroupPermissions 2019-04-06 08:18:40 +02:00
Kenn Jacobsen
a9ceb82158 Don't explode when attempting to create a new content type with a template (mapping issue) 2019-04-05 15:18:34 +02:00
Kenn Jacobsen
1999d6121a Proper fix for the mapping 2019-04-04 20:09:21 +02:00
Kenn Jacobsen
295f805f6a Can't save template (fix template mapping) 2019-04-04 19:57:10 +02:00
Stephan
aad245d5a8 Fix mappers 2019-04-03 11:17:51 +02:00
Stephan
7fa71a2f4e Fix mappers 2019-04-03 11:03:35 +02:00
Stephan
7a6884d208 Rename mapper stuff 2019-04-03 10:39:49 +02:00
Stephan
f8f1fea407 Various corrections to mappers 2019-03-28 12:38:04 +01:00
Stephan
72bdf56ddf Cleanup and fix mappers 2019-03-27 09:15:32 +01:00
Stephan
70c2090a56 Refactor more mappers - AutoMapper gone now 2019-03-27 09:15:32 +01:00
Stephan
d274737296 Refactor more mappers 2019-03-27 09:15:32 +01:00
Stephan
92139dd0c9 Refactor more mappers 2019-03-27 09:15:32 +01:00
Stephan
5bcafba34c Refactor more mappers 2019-03-27 09:15:32 +01:00