Shannon
|
bd2414bc49
|
WIP committing a change for the file upload to convert to a component but will revert because using a directive to get the culture isn't going to work because a property can be invariant so the property itself needs to know it's own culture, not just the culture of the current variant.
|
2018-08-07 11:41:57 +10:00 |
|
Shannon
|
7f09814973
|
Merge branch 'temp-editing-all-variants' into temp-variants-with-file-uploads
|
2018-08-07 09:18:48 +10:00 |
|
Shannon
|
dc5f3c1f27
|
only set the active culture if the content item is variant
|
2018-08-07 09:12:44 +10:00 |
|
Shannon
|
6dfaaffdfe
|
adds null check in invariant content
|
2018-08-07 09:06:19 +10:00 |
|
Shannon
|
e53fe669ef
|
Start to setting files with a culture and catering for being able to set any metadata for files
|
2018-08-07 00:43:52 +10:00 |
|
Shannon
|
f37fe60bd5
|
Merge remote-tracking branch 'origin/temp8' into temp-editing-all-variants
|
2018-08-06 22:08:35 +10:00 |
|
Shannon
|
c000ef0b5c
|
adding some code docs
|
2018-08-06 21:50:23 +10:00 |
|
Shannon
|
3777ea9a7d
|
Moves the 'editor' variant editor to a separate directive so that we can separate out a bit of logic and have a form to watch for dirty tracking on the header value
|
2018-08-06 21:19:36 +10:00 |
|
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 |
|
Shannon
|
a0f7dbbc60
|
Only update variant info if it is dirty
|
2018-08-06 18:05:04 +10:00 |
|
Shannon
|
7aaf024397
|
more work on validation, saving and publishing
|
2018-08-06 16:50:40 +10:00 |
|
Shannon
|
ad72ba6c6a
|
Fixes up some $watch expressions to be more efficient
|
2018-08-03 15:08:11 +10:00 |
|
Shannon
|
fdf0182ffe
|
TEMP - trying to remove watches to figure out the angular infinite digest loop
|
2018-08-03 10:49:19 +10:00 |
|
Shannon
|
789a9434c1
|
fixes property rebinding with variants and fixes more validation flow
|
2018-08-03 10:22:29 +10:00 |
|
Shannon
|
9b067d3539
|
Merge remote-tracking branch 'origin/temp8' into temp-editing-all-variants
|
2018-08-02 23:57:43 +10:00 |
|
Shannon
|
bfbcbdb604
|
more fixes for validation states when changing variants
|
2018-08-02 23:36:49 +10:00 |
|
Shannon
|
ef4710b6cc
|
several fixes for maintaining a validation state between switching between variants
|
2018-08-02 22:42:49 +10:00 |
|
Shannon
|
1f25847cd7
|
Gets contextual culture server validation working
|
2018-08-02 20:00:35 +10: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 |
|
Mads Rasmussen
|
4ede57836e
|
move insertfield files to new location
|
2018-08-01 09:51:44 +02:00 |
|
Shannon
|
778a557f3c
|
Gets the correct content posting which now binds and validates on the server properly
|
2018-08-01 17:28:39 +10: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 |
|
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
|
dfc8f3837a
|
Merge branch 'temp8' into temp-editing-all-variants
|
2018-08-01 12:36:45 +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
|
5eedfc2a53
|
Merge remote-tracking branch 'origin/temp8' into temp-editing-all-variants
# Conflicts:
# src/Umbraco.Web/Editors/ContentController.cs
|
2018-08-01 11:56:46 +10:00 |
|
Bjarne Fyrstenborg
|
a6d9b4b260
|
Add text-overflow for long labels
|
2018-07-31 23:25:56 +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
|
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 |
|