Shannon
|
7c05f2e86c
|
fixes routing cache key
|
2018-04-24 14:39:52 +10:00 |
|
Shannon
|
e9bfad3c09
|
Merge remote-tracking branch 'origin/temp8' into temp8-U4-11220
|
2018-04-24 13:18:34 +10:00 |
|
Shannon
|
9044c9328d
|
Gets inbound routing working, reduces the amount of non injected dependencies, reduces the amount of DomainHelper instances
|
2018-04-24 13:07:18 +10:00 |
|
Shannon
|
48641166b9
|
WIP - gets 'inbound' routing working to generate culture specific URLs
|
2018-04-24 01:31:01 +10:00 |
|
Robert
|
5e14af7d38
|
Merge pull request #2598 from umbraco/temp8-U4-11219
U4-11219 Wire up new APIs for Variant names
|
2018-04-23 11:09:18 +02:00 |
|
Shannon
|
7d349ef518
|
Replaces instances of UmbracoTemplatePage with UmbracoViewPage
|
2018-04-20 17:40:01 +10:00 |
|
Shannon
|
5dfa0e7446
|
Updates EntityRepository to support normal get operations adds another unit tests, adds notes.
|
2018-04-20 16:07:34 +10:00 |
|
Shannon
|
9325d30e7c
|
adds some notes to the setVariantStatusColor
|
2018-04-20 13:44:20 +10:00 |
|
Shannon
|
d99beb0c8b
|
Gets the tree to display the culture specific name
|
2018-04-20 13:26:45 +10:00 |
|
Shannon
|
e9f0e98d2c
|
Updates EntityRepository to get the variant names for content items ... for the non-paged query which we can use in the tree
|
2018-04-20 13:12:55 +10:00 |
|
Shannon
|
c84087e96b
|
Gets the variant names working in the editor
|
2018-04-20 00:59:23 +10:00 |
|
Shannon
|
d4252a3dc8
|
Merge branch 'dev-v8' into temp8-U4-11219
|
2018-04-20 00:12:31 +10:00 |
|
Shannon
|
6b12fe7c57
|
Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8
# Conflicts:
# src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
|
2018-04-20 00:10:44 +10:00 |
|
Shannon
|
04da7cfd20
|
doh, fixes csproj merge
|
2018-04-20 00:09:12 +10:00 |
|
Shannon
|
d5ebe12983
|
removes ununsed aliases
|
2018-04-20 00:05:45 +10:00 |
|
Stephan
|
5d1abaa713
|
Import missing parameter editor from v7 merge
|
2018-04-19 16:03:54 +02:00 |
|
Shannon
|
e9e0274ad8
|
fixes MultipleContentPickerParameterEditor
|
2018-04-20 00:03:19 +10:00 |
|
Shannon
|
966de9b9f4
|
Merge branch 'dev-v8' into temp8-U4-11219
|
2018-04-19 23:49:06 +10:00 |
|
Shannon
|
c46d4e9e43
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
# src/Umbraco.Core/Persistence/PetaPoco.cs
# src/Umbraco.Core/Scoping/NoScope.cs
# src/Umbraco.Core/Scoping/ScopeProvider.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Tests/Persistence/Migrations/MigrationStartupHandlerTests.cs
# src/Umbraco.Tests/UI/LegacyDialogTests.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI/umbraco/config/create/UI.xml
# src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
# src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/MediaTypeController.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/ClickJackingCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
# src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
|
2018-04-19 23:41:35 +10:00 |
|
Shannon
|
1d0d6e78de
|
fixes tree again
|
2018-04-19 22:32:48 +10:00 |
|
Shannon
|
8ae27ecc27
|
Updates doc type editor to be able to change update the doc type to support being culture variant
|
2018-04-19 22:06:02 +10:00 |
|
Shannon
|
642ce36f59
|
updates when the tree does it's initialization , fixes migration
|
2018-04-19 21:58:59 +10:00 |
|
Shannon Deminick
|
db5ffd6b29
|
Merge pull request #2594 from umbraco/temp8-U4-11128
Manage content variations [U4-11128]
|
2018-04-19 21:49:13 +10:00 |
|
Robert
|
9384cd0f27
|
Merge pull request #2574 from umbraco/temp-U4-11195
fixes U4-11195 Mapping complex properties slow down some queries
|
2018-04-19 12:22:12 +02:00 |
|
Robert
|
0262b4aa76
|
Changed ContentPropertyDto modifier back to override which rendered content with tags unable to be saved
|
2018-04-19 12:10:39 +02:00 |
|
Shannon
|
158eb18de0
|
Merge remote-tracking branch 'origin/dev-v8' into temp8-U4-11128
|
2018-04-19 18:16:49 +10:00 |
|
Sebastiaan Janssen
|
96761efe4d
|
Merge branch 'patch-v7' into dev-v7
|
2018-04-19 09:55:16 +02:00 |
|
Robert
|
8e02aad2bb
|
Merge pull request #2590 from umbraco/temp-U4-11177
U4-11177 Update tree nodes with the new node names based on variant/language
|
2018-04-19 08:35:01 +02:00 |
|
Shannon
|
75fb070825
|
U4-11246 When user belongs to groups and none of them have browse access and one or more have a custom start node applied a YSOD occurs
|
2018-04-19 16:20:18 +10:00 |
|
Shannon Deminick
|
8a0f32e980
|
Merge pull request #2595 from umbraco/temp-U4-11208
U4-11208 Error : "An item with the same key has already been added." into "Umbraco.Core.Services.IdkMap.Populate" method
|
2018-04-19 15:27:00 +10:00 |
|
Stephan
|
a68e37c67b
|
Fix availability and names
|
2018-04-18 18:43:17 +02:00 |
|
Stephan
|
dea47dfafe
|
Fix availability and names
|
2018-04-18 18:28:47 +02:00 |
|
Sebastiaan Janssen
|
f5163ed0c2
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2018-04-18 16:05:43 +02:00 |
|
Sebastiaan Janssen
|
694f3d71e2
|
Merge branch 'patch-v7' into dev-v7
|
2018-04-18 16:05:15 +02:00 |
|
Stephan
|
5b1bdd84ee
|
Fix availability and content name (WIP)
|
2018-04-18 16:04:33 +02:00 |
|
Robert
|
15eb40aedb
|
Removed code that populates content tree with duplicate start nodes.
|
2018-04-18 16:01:01 +02:00 |
|
Sebastiaan Janssen
|
49251271e9
|
Merge pull request #2591 from umbraco/temp-U4-10995
Removed code that populates content tree with duplicate start nodes.
|
2018-04-18 15:59:45 +02:00 |
|
Sebastiaan Janssen
|
cc3e75dc63
|
U4-11208 Error : "An item with the same key has already been added." into "Umbraco.Core.Services.IdkMap.Populate" method
|
2018-04-18 15:14:16 +02:00 |
|
Stephan
|
4f17ecbdee
|
Fix tests
|
2018-04-18 14:43:13 +02:00 |
|
Stephan
|
ec7b038569
|
Variant names, availability, etc
|
2018-04-18 14:43:07 +02:00 |
|
Stephan
|
d4244d3807
|
Fix faster languages
|
2018-04-18 14:42:20 +02:00 |
|
Sebastiaan Janssen
|
eeaf17c857
|
Weird revert of a PR that was merged in before
(cherry picked from commit 94ed741dd5)
|
2018-04-18 12:18:44 +02:00 |
|
Stephan
|
46487fa466
|
Variant names, availability, etc
|
2018-04-18 11:14:08 +02:00 |
|
Dave Woestenborghs
|
21a8395142
|
U4-11216 Multiple Content Picker allows only one item when used as macro parameter (#2593)
U4-11216 set min and max number when used as parameter editor
(cherry picked from commit f25233ac2b)
|
2018-04-18 10:22:09 +02:00 |
|
Dave Woestenborghs
|
f25233ac2b
|
U4-11216 Multiple Content Picker allows only one item when used as macro parameter (#2593)
U4-11216 set min and max number when used as parameter editor
|
2018-04-18 10:21:12 +02:00 |
|
Shannon Deminick
|
415810ecfe
|
Merge pull request #2589 from umbraco/temp-U4-11196
Fixes - U4-11196 Validation UI is not working for the content name field
|
2018-04-18 11:16:38 +10:00 |
|
Shannon
|
fd3129f166
|
fixes TODOs
|
2018-04-18 09:42:30 +10:00 |
|
Stephan
|
58e4e2398a
|
Variant names, availability, etc
|
2018-04-17 19:08:53 +02:00 |
|
Stephan
|
392965bb3a
|
Faster languages
|
2018-04-17 19:08:44 +02:00 |
|
Sebastiaan Janssen
|
61cd59b237
|
Merge branch 'patch-v7' into dev-v7
|
2018-04-17 15:47:41 +02:00 |
|