Commit Graph

27835 Commits

Author SHA1 Message Date
Shannon
fd80aecb20 fixes more of the ConvertRelatedLinksToMultiUrlPicker migration 2019-01-29 21:22:01 +11:00
Warren Buckley
7d2024d3fd Merge pull request #4295 from umbraco/temp8-macro-picker-fixes
Fixes UI for macropicker and added submit button
2019-01-29 09:31:41 +00:00
Stephan
d24b7f2aba Refactor enums 2019-01-29 10:17:26 +01:00
Niels Lyngsø
9cd2e36c4b more color corrections for brandcolors 2019 2019-01-29 10:00:38 +01:00
Shannon
47bde0f507 Merge branch 'temp8' into temp8-fixme-no-caching-of-url-and-inject-umbraco-context-accessor 2019-01-29 19:58:40 +11:00
Shannon
7b85ebab56 Adds migration to convert start nodes for picker configuration to UDIs 2019-01-29 19:54:32 +11:00
Bjarke Berg
9c3e501a60 Fixes UI for macropicker and added submit button 2019-01-29 09:46:24 +01:00
Niels Lyngsø
08a8e0793e Design & color changes for 2019 brand colors 2019-01-29 09:30:42 +01:00
Stephan
5135635bf8 Cleanup 2019-01-29 09:15:10 +01:00
Shannon
89a99e1c5f Makes IDashboard IDiscoverable 2019-01-29 18:10:50 +11:00
Shannon
70f23b2245 Merge branch 'temp8' into temp8-fixme-no-caching-of-url-and-inject-umbraco-context-accessor 2019-01-29 17:56:11 +11:00
Shannon
ee693b63bd Fixes issue with ConvertRelatedLinksToMultiUrlPicker migration since it produces invalid SQL if there are no values in the .Contains calls 2019-01-29 17:52:48 +11:00
Shannon
86d8bc0c62 fix merge 2019-01-29 17:19:58 +11:00
Shannon
22d879ab35 Merge branch 'temp8' into temp8-fixme-no-caching-of-url-and-inject-umbraco-context-accessor
# Conflicts:
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Web/Models/PublishedContentBase.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
2019-01-29 17:12:35 +11:00
Stephan
c2f51be0a1 Bugfix 2019-01-28 22:44:00 +01:00
Niels Lyngsø
052cee31b3 color corrections for pink theme 2019-01-28 21:36:04 +01:00
Warren Buckley
4a5eca3c6a Adds in Composition Extension Methods to allow Setting the LogViewer without having to know the composition.RegisterUnique syntax 2019-01-28 15:39:49 +00:00
Stephan
9eabc1fb3f More NuCache/PublishedContent cleanup 2019-01-28 16:23:10 +01:00
Warren Buckley
633d9c6fb4 Merge pull request #4218 from umbraco/temp8-dashboards-collection
V8 - Remove dashboards.config - use CollectionBuilder
2019-01-28 14:47:44 +00:00
Stephan
9b4b8b9d86 Cleanup NuCache/PublishedContent 2019-01-28 14:15:47 +01:00
Stephan
85d4b4a61d Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-28 14:07:19 +01:00
Stephan
d901e14e4f Merge branch 'temp8-ispublished-again' into temp8 2019-01-28 14:06:17 +01:00
Stephan
27fd908517 Refactor IPublished 2019-01-28 14:05:59 +01:00
Niels Lyngsø
d262b524df Merge remote-tracking branch 'origin/temp8-ui-overlay-button-style' into temp8-ui-update-color-to-2019-brandcolor-pink 2019-01-28 13:18:04 +01:00
Niels Lyngsø
f619b03b04 Correct spelling 2019-01-28 13:17:38 +01:00
Niels Lyngsø
1f09292ee3 Merge remote-tracking branch 'origin/temp8-ui-overlay-button-style' into temp8-ui-update-color-to-2019-brandcolor-pink 2019-01-28 13:15:52 +01:00
Niels Lyngsø
9a0f50291c color adjustments for proposal 2019-01-28 13:15:40 +01:00
Stephan
a344a2f240 Merge branch 'temp8' into temp8-ispublished-again 2019-01-28 13:08:30 +01:00
Stephan
fac25b5971 Bugfix 2019-01-28 13:04:37 +01:00
Stephan
c675708388 Refactor dashboards 2019-01-28 12:38:58 +01:00
Warren Buckley
117b836cd7 Merge pull request #4259 from umbraco/temp8-remove-related-links-with-migration
Remove related links and migrate existing data to Multi URL Picker
2019-01-28 09:42:56 +00:00
Stephan
918908a785 Merge branch 'temp8' into temp8-dashboards-collection 2019-01-28 10:35:34 +01:00
Stephan
c2a404c02d Update ModelsBuilder 2019-01-28 10:34:57 +01:00
Stephan
e410b8b067 Fix TreeUse 2019-01-28 10:27:36 +01:00
Stephan
27ecd795b2 Merge branch temp8 into temp8-fixtree 2019-01-28 10:19:36 +01:00
Warren Buckley
e7181915ff Merge remote-tracking branch 'origin/temp8' into temp8-remove-legacy-controls 2019-01-28 08:40:25 +00:00
Warren Buckley
9f79f1833f Merge remote-tracking branch 'origin/temp8' into temp8-dashboards-collection
# Conflicts:
#	src/Umbraco.Web/Services/DashboardService.cs
2019-01-28 08:33:52 +00:00
Niels Lyngsø
df00cfab40 Merge remote-tracking branch 'origin/temp8-ui-update-colors-to-2019-brandcolors' into temp8-ui-update-color-to-2019-brandcolor-pink 2019-01-28 09:31:24 +01:00
Niels Lyngsø
f0611fff90 correct color variable for variant switcher 2019-01-28 09:30:08 +01:00
Niels Lyngsø
da3a5d35c1 make unpublish button in overlay appear as button-style warning 2019-01-28 09:00:38 +01:00
Bjarke Berg
3c24aac81d Merge remote-tracking branch 'origin/temp8' into temp8-ispublished-again 2019-01-28 08:46:17 +01:00
Bjarke Berg
9b01910d44 Removed isPublished stuff from XmlPublishedContent. 2019-01-28 08:27:42 +01:00
Niels Lyngsø
6b0158f761 color update 2019-01-27 18:14:55 +01:00
Sebastiaan Janssen
7e8c0ed369 Apply changes from PR #4197 to v8 too 2019-01-27 15:17:08 +01:00
Sebastiaan Janssen
cebf1e6c22 Merge branch 'dev-v7' into temp8
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Routing/PublishedRequest.cs
2019-01-27 13:47:22 +01:00
Sebastiaan Janssen
d174499e50 Fixes #4260 incorrect permissions required for Notifications sign up 2019-01-27 13:30:44 +01:00
Sebastiaan Janssen
647d92775c Make right-click menu work in Firefox 2019-01-27 12:02:39 +01:00
Kenn Jacobsen
a185d56ae5 Ensure that element types can't be assigned as allowed children to other content types 2019-01-27 11:46:55 +01:00
Chris Houston
193e24afd2 Fixing all the TODO, FIXME & HACK comments so they all follow the same layout. 2019-01-27 11:16:00 +01:00
Kenn Jacobsen
d31e25281d Fix infinite loop when saving multiple variants using list view 2019-01-27 10:41:50 +01:00