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 |
|
Shannon
|
e9e0274ad8
|
fixes MultipleContentPickerParameterEditor
|
2018-04-20 00:03:19 +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
|
642ce36f59
|
updates when the tree does it's initialization , fixes migration
|
2018-04-19 21:58:59 +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
|
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
|
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 |
|
Sebastiaan Janssen
|
7d171b1e95
|
Bumps version to 7.10.4
|
2018-04-17 15:46:39 +02:00 |
|
Sebastiaan Janssen
|
d63061fade
|
Merge pull request #2564 from leekelleher/U4-11184
U4-11184 - Nested Content PropertyValueEditor - return converted value, not update reference value
|
2018-04-17 15:33:14 +02:00 |
|
Stephan
|
26af63549f
|
Fix vsts - wip
|
2018-04-17 10:52:32 +02:00 |
|
Stephan
|
70e3f895da
|
Fix vsts - wip
|
2018-04-17 10:11:14 +02:00 |
|
Shannon
|
f80a27f5d7
|
adds notes
|
2018-04-17 17:09:58 +10:00 |
|
Shannon
|
f3d68276fe
|
Fixes more angular promise chaining, fixes issue with the tree node UI not updating when sycn tree is called.
|
2018-04-17 17:04:52 +10:00 |
|
Claus
|
0c191a3ef7
|
updating to use includeProperties, fixing modifier keywords for methods, and passing includeProperties from list views.
|
2018-04-17 08:36:36 +02:00 |
|
Shannon
|
2872d0b0a2
|
Fixes tree init logic when user isn't logged in, moves sequential promise chaining to a helper funciton, updates the route promise chaining to actual chain.
|
2018-04-17 14:43:17 +10:00 |
|
Stephan
|
c97822a430
|
Fix vsts
|
2018-04-16 17:48:45 +02:00 |
|
Shannon
|
319bd783ff
|
Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11177
|
2018-04-17 01:45:32 +10:00 |
|
Shannon
|
e234eb22f6
|
ensure the language tree changing is done after the digest
|
2018-04-17 01:41:06 +10:00 |
|
Shannon
|
d45112f2ab
|
Gets the content tree controller to return the names for items per language (with mock data), wires up the navigation.controller to re-build the tree for the new language
|
2018-04-17 01:37:35 +10:00 |
|
Stephan
|
6b3c6eba8d
|
Fix csproj, nuspec
|
2018-04-16 17:04:23 +02:00 |
|
Shannon
|
f7719773f2
|
fixes passing in the element and clicking on a root node
|
2018-04-17 00:38:32 +10:00 |
|
Shannon
|
b5b643e04c
|
fixes up the activeTree issue
|
2018-04-17 00:09:53 +10:00 |
|
Stephan
|
dc589f9b96
|
Fix csproj, nuspec
|
2018-04-16 16:08:26 +02:00 |
|
Shannon
|
a92361bd00
|
Tree refactor, cleanup legacy support, remove odd jquery callback object, removes unused files, removes publish dialog
|
2018-04-16 23:07:00 +10:00 |
|
Robert
|
f7ce8af24d
|
Language picker is now included in the invalid field prompt (red border) so it makes sense aesthetically.
|
2018-04-16 14:58:54 +02:00 |
|
Shannon Deminick
|
9ac96f24aa
|
Merge pull request #2587 from dawoe/temp-U4-11150
U4-11150 added culture property of tour to the docs
|
2018-04-16 16:48:25 +10:00 |
|