Mads Rasmussen
|
312b2ff435
|
Merge branch 'dev-v8' into temp-U4-11218
|
2018-04-23 09:43:22 +02: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 |
|
Mads Rasmussen
|
ee853f0189
|
Merge branch 'dev-v8' into temp-U4-11218
|
2018-04-19 15:15:10 +02: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 |
|
Mads Rasmussen
|
03ac073c02
|
Merge branch 'dev-v8' into temp-U4-11218
# Conflicts:
# src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
|
2018-04-19 09:59:31 +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 |
|
Mads Rasmussen
|
e6a69ccb0d
|
add feature toggle for media grid edit button
|
2018-04-17 09:55:31 +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 |
|
Mads Rasmussen
|
97548df146
|
rename folder
|
2018-04-16 21:42:11 +02:00 |
|
Mads Rasmussen
|
ebf3ab3a41
|
add helpers to open media picker and media editor
|
2018-04-16 21:27:07 +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 |
|
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 |
|
Mads Rasmussen
|
d0f9021bcf
|
Merge branch 'temp-U4-11218' into temp-v8-UI-infinite-editing
|
2018-04-16 15:27:29 +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 |
|
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 |
|
Bjarne Fyrstenborg
|
d45c3520d4
|
Format document in media create dialog
|
2018-04-15 21:42:35 +02:00 |
|
Bjarne Fyrstenborg
|
b7c04575fa
|
Document media type resource save as in member type resource
|
2018-04-15 21:42:04 +02:00 |
|
Bjarne Fyrstenborg
|
588f5a3789
|
Fix some wrong descriptions
|
2018-04-15 21:41:23 +02:00 |
|
Bjarne Fyrstenborg
|
b535a45898
|
Respect icon set on member type - by default the icon is "icon-user"
|
2018-04-15 21:39:46 +02:00 |
|
Robert
|
aebfc33037
|
Class renamed in .less file to bring back UI validation for content name
|
2018-04-13 14:51:02 +02:00 |
|
Sebastiaan Janssen
|
1b56c55300
|
Merge pull request #2522 from tomfulton/u4-7757-client2
U4-7757 - Show notifications when Unpublishing event is canceled
|
2018-04-13 11:53:51 +02:00 |
|
Mads Rasmussen
|
bf78bb16dd
|
fixes: U4-11209 Update layout for developer dashboards to fit new styles
|
2018-04-12 18:37:37 +02:00 |
|
Sebastiaan Janssen
|
94ed741dd5
|
Weird revert of a PR that was merged in before
|
2018-04-12 17:50:44 +02:00 |
|
Shannon
|
b53400ceca
|
Fixes up promise chains for the tree, adds logic to the tree picker to track the deepest paths expanded and then when a language is changed, we reload the tree with the new language and also sync all paths so the user can continue where they left off but with the new language nodes.
|
2018-04-13 00:09:28 +10:00 |
|
Bjarne Fyrstenborg
|
828dbaedfb
|
Indicate that a row is clickable and highlight with background color. (#1473)
|
2018-04-12 15:37:01 +02:00 |
|
Shannon
|
f903c42d1b
|
Gets the tree reloading when the customtreeparams change too so now the language selection will auto trigger the tree to reload ... next task we'll make it re-sycn and work.
|
2018-04-12 21:56:49 +10:00 |
|
Shannon
|
fddea8c815
|
Fixes data type pre-value issues with MNTP, removes unecessary contentpicker.html and memberpicker.html overlays since treepicker.html is all that should be used, cleans up the treepicker one to be more inline with our current angular standards. Removes uneeded event handling from treepicker
|
2018-04-12 21:29:36 +10:00 |
|
Shannon
|
80d682c22a
|
Merge branch 'dev-v8' into temp-U4-11179
|
2018-04-12 14:30:50 +10:00 |
|