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 |
|
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 |
|
Stephan
|
a6dc5f0eac
|
Refactor more mappers
|
2019-03-27 09:15:31 +01:00 |
|
Marcel van Helmont
|
ff708f4ad5
|
fixed correct destination url instead of #.
|
2019-02-26 12:17:20 +01:00 |
|
Marcel van Helmont
|
44212f6b53
|
Revert "the wrong id was used for getting the correct destination url."
This reverts commit 5d1fccb2c4.
|
2019-02-26 12:15:22 +01:00 |
|
Marcel van Helmont
|
5d1fccb2c4
|
the wrong id was used for getting the correct destination url.
|
2019-02-26 12:12:18 +01:00 |
|
Stephan
|
90feb463aa
|
Cleanup
|
2019-02-21 14:13:37 +01:00 |
|
Shannon
|
04487557d7
|
Merge branch 'v8-fix-use-client-culture' of https://github.com/kjac/Umbraco-CMS into kjac-v8-fix-use-client-culture
|
2019-02-19 01:05:11 +11:00 |
|
Kenn Jacobsen
|
1c554a8770
|
Add generic section icon in section picker + clean up legacy section icon stuff
|
2019-02-18 13:35:08 +01:00 |
|
Stephan
|
7185089f1d
|
Move sections to their own namespace
|
2019-02-18 11:22:25 +01:00 |
|
Bjarke Berg
|
8e29dbd494
|
#4569 - Rename TinyMCE property editor alias (From TinyMCEv3)
#379 - Rename Label property editor alias (From NoEdit)
|
2019-02-15 13:52:02 +01:00 |
|
Shannon
|
3223f23ce4
|
Dont throw if a property editor isn't found, this prevents the user from doing anything (i.e. if a DLL is removed for some reason like package uninstall), instead default to label so that the admin can actually make changes.
|
2019-02-15 14:41:20 +11:00 |
|
Shannon
|
6f7e1cac3e
|
Merge branch 'temp8' into temp8-contexts
|
2019-02-15 12:55:17 +11:00 |
|
Kenn Jacobsen
|
7b03bc20cc
|
Support localization of template and content type names in the content mapper
|
2019-02-14 12:46:27 +01:00 |
|
Stephan
|
abceda7750
|
Kill UmbracoContext.Current
|
2019-02-14 10:39:49 +01:00 |
|
Claus
|
a37512ffb4
|
Merge branch 'v8-fix-localize-content-apps' of https://github.com/kjac/Umbraco-CMS into kjac-v8-fix-localize-content-apps
|
2019-02-14 10:35:52 +01:00 |
|
Kenn Jacobsen
|
2927ff0af7
|
Merge branch 'temp8' into v8-fix-use-client-culture
|
2019-02-14 09:36:54 +01:00 |
|
Bjarke Berg
|
1b6fd92087
|
#4542 - Get the editor from the new dataType instead of the old propertyEditory
|
2019-02-13 10:49:32 +01:00 |
|
Kenn Jacobsen
|
730a2f7768
|
Localize content app names
|
2019-02-13 08:11:01 +01:00 |
|