Robert
|
398c75ca4d
|
Merge pull request #2833 from umbraco/temp8-126
fixes: Update UI on the dictionary editor to match V8 styles
|
2018-08-06 11:04:20 +02:00 |
|
Warren Buckley
|
4b2ddbdbdd
|
Merge pull request #2832 from umbraco/temp-92
fixes temp-92: Code editing: Convert overlays into infinite editors
|
2018-08-06 09:54:58 +01:00 |
|
Mads Rasmussen
|
85b18eec05
|
only allow to open template if user has access to settings section
|
2018-08-06 10:47:20 +02:00 |
|
Mads Rasmussen
|
bef6afe359
|
post-merge fix: open doctype in infinite editing from info app
|
2018-08-02 11:41:40 +02:00 |
|
Mads Rasmussen
|
fceb7804b4
|
fixes: Update UI on the dictionary editor to match V8 styles
|
2018-08-02 11:05:04 +02:00 |
|
Mads Rasmussen
|
788ed8b61b
|
make template editor support infinite editing
|
2018-08-02 10:00:11 +02:00 |
|
Mads Rasmussen
|
759c21cec9
|
use infinite macropicker in partial views and partial view macro editior
|
2018-08-01 20:06:35 +02:00 |
|
Mads Rasmussen
|
3e36e06d77
|
add extra markup for the infinite editor
|
2018-08-01 19:01:44 +02:00 |
|
Mads Rasmussen
|
0a31ac6ef3
|
use macropicker in template editor
|
2018-08-01 18:47:55 +02:00 |
|
Mads Rasmussen
|
bf4b48aa9d
|
move the macropicker files to the infinite editor folder
|
2018-08-01 18:47:08 +02:00 |
|
Mads Rasmussen
|
caf942db8b
|
Merge branch 'temp8' into temp-92
|
2018-08-01 16:01:41 +02:00 |
|
Mads Rasmussen
|
b28d23b8e7
|
add item picker infinite editor + use in template editor
|
2018-08-01 15:20:48 +02:00 |
|
Mads Rasmussen
|
b5f02367ab
|
Use new template section infinite editor instead of the old overlay in the template editor
|
2018-08-01 13:34:01 +02:00 |
|
Mads Rasmussen
|
fbfcccc13d
|
add infinite editor markup to template sections
|
2018-08-01 13:33:17 +02:00 |
|
Mads Rasmussen
|
37db8516ed
|
move template sections overlay to infinite editors
|
2018-08-01 13:13:09 +02:00 |
|
Mads Rasmussen
|
d7c0a92d9f
|
update insert code snippet infinite editor to use new insert field editor
|
2018-08-01 12:30:31 +02:00 |
|
Mads Rasmussen
|
d88ed02a8d
|
use insert field infinite editor in template, partial views and macro partial views editors
|
2018-08-01 11:47:48 +02:00 |
|
Mads Rasmussen
|
4cc31a62c0
|
convert insertfeld overlay to an infinite editor
|
2018-08-01 11:46:28 +02:00 |
|
Stephan
|
f049d1b479
|
Ensure PublishedRequest always has a culture
|
2018-08-01 10:42:50 +02:00 |
|
Mads Rasmussen
|
4ede57836e
|
move insertfield files to new location
|
2018-08-01 09:51:44 +02:00 |
|
Sebastiaan Janssen
|
638f71d80e
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html
# src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/TemplateController.cs
|
2018-08-01 08:45:18 +02:00 |
|
Sebastiaan Janssen
|
f849ca38fc
|
Merge pull request #2829 from readingdancer/U4-11551
Fixing various broken links in the source code
|
2018-08-01 08:04:20 +02:00 |
|
Sebastiaan Janssen
|
11aea0f515
|
We need to create the template from it's alias, which is the safeAlias, which is the correct filename
Relates to: https://github.com/umbraco/Umbraco-CMS/pull/2828#issuecomment-409452155
|
2018-08-01 07:18:44 +02:00 |
|
Sebastiaan Janssen
|
d803aeb205
|
Merge pull request #2827 from umbraco/temp-U4-11059
Changing the document type alias before first save leads to YSOD
|
2018-08-01 07:17:07 +02:00 |
|
Chris Houston
|
9663cfde82
|
Fixed issue with creating doctypes & templated with an Ampersand : http://issues.umbraco.org/issue/U4-11550 (#2828)
|
2018-08-01 07:16:38 +02:00 |
|
Sebastiaan Janssen
|
1d5a807e0d
|
Merge pull request #2826 from bjarnef/dev-v7-U4-9025-3
U4-9025 - Fix styling of prevalues
|
2018-08-01 06:43:29 +02:00 |
|
Chris Houston
|
bb59c4708d
|
Just triggering AppVeyor :)
As per my other pull request, pretty sure the one unit test failed due to it running close to midnight on the last day of the month.
|
2018-08-01 00:30:44 -04:00 |
|
Chris Houston
|
23fda3a0ed
|
Fixing various broken links in the source code, some are just in comments and others are actually used within Umbraco, also added HTTPS where possible.
|
2018-07-31 23:00:46 -04:00 |
|
Shannon
|
35af025ae3
|
fixes migrations for v8
|
2018-08-01 12:37:44 +10:00 |
|
Shannon
|
19851b6986
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/AddRelationTypeForMediaFolderOnDelete.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/IncreaseLanguageIsoCodeColumnLength.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/UpdateUmbracoConsent.cs
# src/Umbraco.Core/Persistence/PetaPoco.cs
# src/Umbraco.Core/PluginManager.cs
# src/Umbraco.Core/Services/Implement/UserService.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
# src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
# src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
# src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs
# src/Umbraco.Web/Install/FilePermissionHelper.cs
# src/Umbraco.Web/Trees/PackagesTreeController.cs
# src/Umbraco.Web/UI/JavaScript/UmbracoClientDependencyLoader.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/umbraco.presentation/content.cs
# src/Umbraco.Web/umbraco.presentation/requestModule.cs
# src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
# src/umbraco.cms/businesslogic/Content.cs
# src/umbraco.cms/businesslogic/Packager/PackageActions/publishRootDocument.cs
|
2018-08-01 12:26:26 +10:00 |
|
Shannon
|
55e1a792da
|
Fixes migrations for 7.12.0
|
2018-08-01 12:15:18 +10:00 |
|
Bjarne Fyrstenborg
|
a6d9b4b260
|
Add text-overflow for long labels
|
2018-07-31 23:25:56 +02:00 |
|
Sebastiaan Janssen
|
4422c5ec52
|
Update AllowedTemplates list as well if the doctype alias is not the generated one
|
2018-07-31 22:39:22 +02:00 |
|
Bjarne Fyrstenborg
|
c4fc5a04f9
|
Adjust color picker prevalues to fit within overlay
|
2018-07-31 22:16:33 +02:00 |
|
Bjarne Fyrstenborg
|
63bbbbab31
|
Adjust multivalues styles
|
2018-07-31 22:15:30 +02:00 |
|
Sebastiaan Janssen
|
fc6dc25224
|
Merge pull request #2825 from readingdancer/U4-11472
Fixes issue #U4-11472
|
2018-07-31 22:03:49 +02:00 |
|
Sebastiaan Janssen
|
fe914dc339
|
Also make sure the alias gets generated from the full name and not just the part before the &
|
2018-07-31 22:01:35 +02:00 |
|
Mads Rasmussen
|
23136c5f4f
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
|
2018-07-31 20:49:24 +02:00 |
|
Mads Rasmussen
|
1bdd848582
|
Post-merge color picker fixes
|
2018-07-31 20:48:44 +02:00 |
|
Chris Houston
|
a2cb5fac98
|
Fixes issue #U4-11472
Document type, Media Type & Data Type folders did not support Ampersands in their names, now they do.
|
2018-07-31 11:06:06 -04:00 |
|
Stephan
|
ee5a834ab0
|
Ensure build respects NUGET_PACKAGES
|
2018-07-31 15:55:31 +02:00 |
|
Stephan
|
a3f2372b6c
|
Post-merge namespace cleanup
|
2018-07-31 14:56:40 +02:00 |
|
Stephan
|
c209bdde5b
|
Fix routing, AliasUrlProvider
|
2018-07-31 14:48:30 +02:00 |
|
Stephan
|
f35c63fa40
|
Renormalize
|
2018-07-31 14:14:52 +02:00 |
|
Stephan
|
309ca0a765
|
Fix tests after merge (loadPackager tree is gone)
|
2018-07-31 13:41:38 +02:00 |
|
Stephan
|
abc2bfa774
|
Cleanup merge of migrations
|
2018-07-31 13:35:12 +02:00 |
|
Stephan
|
3c446a3ba0
|
Cleanup merge of Color Picker editor
|
2018-07-31 13:35:12 +02:00 |
|
Stephan
|
f30171bcfd
|
Cleanup filenames
|
2018-07-31 13:35:12 +02:00 |
|
Warren
|
80db20fdfb
|
Fix up failing JS unit test from a recent change from V8 hackathon to the query builder syntax (was curly's on new lines)
|
2018-07-31 11:18:24 +01:00 |
|
Mundairson
|
9cd2db5018
|
U4-11546 [v7] Clean up to remove compiler warnings (#2823)
|
2018-07-31 10:41:15 +02:00 |
|