Warren
|
2246e5bc2f
|
Reverts change from merge in U4-11289 aka PR#2608 from Shan - that causes the Karma unit JS tests to fail - not sure why the chained version fails though & thus the Powershell ZIP & Nuget build output script
|
2018-05-02 14:03:00 +01:00 |
|
Robert
|
64d467e071
|
Merge pull request #2608 from umbraco/temp8-U4-11289
U4-11289 Tracking the currently selected language in the main tree
|
2018-05-02 12:10:02 +02:00 |
|
Shannon
|
6fe9c4d4df
|
Fixes the null PublishName problem, ensures the quey strings are not replaced when selecting a doc type
|
2018-05-02 15:35:26 +10:00 |
|
Shannon
|
9843f3a5fd
|
Ensures that domains assigned to non-published nodes are filtered when routing, ensures caches are cleared when content is deleted or langauges are changed, updates logic for dealing with null invariant content names, adds more validation for saving cultre variants.
|
2018-05-02 14:52:00 +10:00 |
|
Shannon
|
fb759e3923
|
Merge remote-tracking branch 'origin/temp8' into temp8-U4-11289
|
2018-05-02 13:11:19 +10:00 |
|
Robert
|
106955f6c3
|
Adds localization keys for some text, removed duplicate loading indicator
|
2018-05-01 16:41:36 +02:00 |
|
Robert
|
adfc8769e6
|
Adding missing service injection which broke discard changes dialog
|
2018-05-01 13:16:13 +02:00 |
|
Robert
|
630212f66f
|
remove console log
|
2018-05-01 12:06:43 +02:00 |
|
Robert
|
a4b5e08a73
|
Simplified the way we mark variants as drafts trough localization keys, show published languages in the overlay instead of hiding them
|
2018-05-01 12:03:34 +02:00 |
|
Shannon
|
be4ea93d12
|
U4-11289 Tracking the currently selected language in the main tree
|
2018-05-01 18:17:07 +10:00 |
|
Robert
|
fc860d5061
|
Merge branch 'temp8' into temp8-U4-11173
|
2018-05-01 08:27:45 +02:00 |
|
Robert
|
03c574a97c
|
Merge pull request #2605 from umbraco/temp8-U4-11290
U4-11290 - Disables Open in List View link from variant/language switcher in node name
|
2018-05-01 08:11:54 +02:00 |
|
Shannon
|
c8d2ea141b
|
Removes more xslt, more very old code and configurations that aren't used anymore
|
2018-05-01 01:15:43 +10:00 |
|
Robert
|
a4b24bf198
|
Content language picker now contains (if needed) Draft state to be consistent with the Publish dialog
|
2018-04-30 16:23:32 +02:00 |
|
Robert
|
92d88d5a4c
|
Publish dialog should show only variants in Draft state
|
2018-04-30 16:18:35 +02:00 |
|
Shannon
|
890b5f30a1
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/Configuration/UmbracoSettings/IRepositoriesSection.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IRepository.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoriesCollection.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoriesElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryConfigExtensions.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
# src/Umbraco.Core/Services/PackagingService.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementDefaultTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementTests.cs
# src/Umbraco.Tests/Plugins/PluginManagerTests.cs
# src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs
# src/umbraco.cms/umbraco.cms.csproj
|
2018-04-30 23:25:07 +10:00 |
|
Warren
|
954098eb7e
|
Comments out & leaves comment about removing the open in split view link (otherwise we will forget)
|
2018-04-30 13:52:05 +01:00 |
|
Shannon
|
cb3cba5b05
|
Updates DefaultUrlProvider so that hieararchy of nodes that are variant and invariant still generate URLs correctly
|
2018-04-26 23:34:06 +10:00 |
|
Shannon
|
f49fa7b567
|
don't show the variation toggle on a property type if the content type doesn't have it enabled, ensure the default variation is set on a new property type based on the content type setting
|
2018-04-24 15:41:50 +10:00 |
|
Shannon
|
d552d5dadb
|
Updates UI and mapping to update a property type to allow being culture variant
|
2018-04-24 15:27:33 +10:00 |
|
Robert
|
395575dbe4
|
Merge pull request #2597 from umbraco/temp-U4-11253
U4-11253 New Chrome 66 trimStart function is overriding the Umbraco C…
|
2018-04-20 09:39:15 +02:00 |
|
Shannon
|
9325d30e7c
|
adds some notes to the setVariantStatusColor
|
2018-04-20 13:44:20 +10:00 |
|
Sebastiaan Janssen
|
386dc1a14d
|
U4-11253 New Chrome 66 trimStart function is overriding the Umbraco Core trimStart polyfill
|
2018-04-19 19:54:53 +02: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 |
|
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
|
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 |
|
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 |
|
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
|
fd3129f166
|
fixes TODOs
|
2018-04-18 09:42:30 +10:00 |
|
Sebastiaan Janssen
|
61cd59b237
|
Merge branch 'patch-v7' into dev-v7
|
2018-04-17 15:47:41 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Dave Woestenborghs
|
eca5b6e4e6
|
U4-11150 added culture property of tour to the docs
|
2018-04-16 08:35:05 +02:00 |
|
Sebastiaan Janssen
|
2dd7c5210f
|
Merge pull request #2523 from tomfulton/u4-11133
U4-11133 - Fix access check for Unpublish button
|
2018-04-15 22:48:16 +02:00 |
|