Mads Rasmussen
|
3dff904264
|
get children from the current node id and not the parent
|
2018-08-02 17:15:26 +02:00 |
|
Mads Rasmussen
|
2b25de4ae6
|
save sort order
|
2018-08-02 16:17:53 +02:00 |
|
Mads Rasmussen
|
0ea7bdfe7b
|
get children for sort dialog
|
2018-08-02 15:51:41 +02:00 |
|
Warren
|
6967ed1846
|
Adds in Sort Angular dialog from Mads & removes some of the old sort dialog parts
|
2018-08-02 13:52:13 +01:00 |
|
Warren
|
1b20f0be0d
|
Scaffold HTML & Angular Controller to put in a UI (Probably with some help from Mads)
|
2018-08-02 11:16:31 +01:00 |
|
Warren
|
eb220b6db0
|
Add in jQuery VUpalidate & Unobtrusive into bower
Update ref's to new path
|
2018-08-01 22:35:03 +01: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
|
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 |
|
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 |
|
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 |
|
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 |
|
Shannon
|
d272dbf611
|
Merge branch 'dev-v7' into temp8
# Conflicts:
# build/NuSpecs/tools/Readme.txt
# src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs
# src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs
# src/Umbraco.Core/Packaging/Models/PackageAction.cs
# src/Umbraco.Core/PropertyEditors/PreValueField.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
# src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
# src/Umbraco.Tests/Dependencies/NuGet.cs
# src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
# src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
# src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml
# src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml
# src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml
# src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml
# src/Umbraco.Tests/Services/PerformanceTests.cs
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
# src/Umbraco.Web.UI.Client/src/less/navs.less
# src/Umbraco.Web.UI.Client/src/less/tree.less
# 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/common/overlays/help/help.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
# src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
# src/Umbraco.Web.UI/Properties/Settings.Designer.cs
# src/Umbraco.Web.UI/Properties/Settings.settings
# src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
# src/Umbraco.Web.UI/config/feedProxy.Release.config
# src/Umbraco.Web.UI/config/feedProxy.config
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/umbraco/config/lang/de.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/es.xml
# src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
# src/Umbraco.Web.UI/umbraco/config/lang/he.xml
# src/Umbraco.Web.UI/umbraco/config/lang/it.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
# src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
# src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
# src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Install/InstallHelper.cs
# src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
# src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
# src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
# src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
# src/Umbraco.Web/Properties/Settings.settings
# src/Umbraco.Web/Properties/Settings1.Designer.cs
# src/Umbraco.Web/Routing/PublishedContentRequest.cs
# src/Umbraco.Web/Trees/PackagesTreeController.cs
# src/Umbraco.Web/UI/LegacyDialogHandler.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
# src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
# src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl
# src/Umbraco.Web/app.config
# src/Umbraco.Web/umbraco.presentation/item.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs
# src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs
# src/umbraco.MacroEngines/RazorDynamicNode/DynamicNodeList.cs
# src/umbraco.businesslogic/ApplicationTree.cs
# src/umbraco.businesslogic/BasePages/BasePage.cs
# src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
# src/umbraco.editorControls/uploadfield/uploadField.cs
|
2018-07-31 14:57:20 +10:00 |
|
Shannon
|
f4342ed9cb
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI/web.Template.Debug.config
|
2018-07-31 12:34:03 +10:00 |
|
Steven Harland
|
92b11bf966
|
Increase z-index of .umb-nav-tabs (#2566)
This lowers the chances of property editors overlapping the tab overflow menu.
More info here: http://issues.umbraco.org/issue/U4-11185
|
2018-07-30 17:10:50 +02:00 |
|
Steven Harland
|
a7f68fa3d3
|
Add margin and padding to tabs dropdown (#2560)
This reduces the space between the active tab and tab content so that they bleed into each other.
More info here: http://issues.umbraco.org/issue/U4-11181
|
2018-07-30 17:03:53 +02:00 |
|
Sebastiaan Janssen
|
86acf0c1ad
|
Revert "enable use of radiobuttonlist pre editor"
This reverts commit 80412f56ee.
|
2018-07-30 15:46:34 +02:00 |
|
Sebastiaan Janssen
|
2ea5a7a293
|
Make radiobuttonlist work with configs as well
Re: https://github.com/umbraco/Umbraco-CMS/pull/2763#issuecomment-408848485
|
2018-07-30 15:46:02 +02:00 |
|
Shannon
|
a83ea47c25
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/Constants-Conventions.cs
# src/Umbraco.Core/DatabaseContext.cs
# src/Umbraco.Core/Models/Rdbms/LanguageDto.cs
# src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
# src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
# src/Umbraco.Core/PropertyEditors/PreValueField.cs
# src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs
# src/Umbraco.Core/Services/FileService.cs
# src/Umbraco.Core/Services/IFileService.cs
# src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs
# src/Umbraco.Tests/App.config
# src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
# src/Umbraco.Web.UI.Client/src/less/hacks.less
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/less/variables.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
# src/Umbraco.Web.UI.Client/src/views/media/move.html
# src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
# src/Umbraco.Web.UI/Views/Web.config
# src/Umbraco.Web.UI/umbraco/Install/Views/Web.config
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/TemplateController.cs
# src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
# src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
# src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
# src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/umbraco.MacroEngines/Resources/Web.config
# src/umbraco.cms/Actions/ActionRestore.cs
# src/umbraco.editorControls/yesno/YesNoDataType.cs
|
2018-07-30 21:31:35 +10:00 |
|
Stephan
|
2ce9d9f7dc
|
Fix medias (broken by removing not-so-obsolete method)
|
2018-07-30 13:27:35 +02:00 |
|
Sebastiaan Janssen
|
6f409fdec2
|
Merge pull request #2803 from callumbwhyte/query-builder-updates
V8 Hackathon: Query builder updates [v8hackaton]
|
2018-07-30 12:43:49 +02:00 |
|
Sebastiaan Janssen
|
8404efc521
|
Adds a few updates from PR #2820 and updates feedProxy to allow both .org and .com
|
2018-07-30 11:38:51 +02:00 |
|
Sebastiaan Janssen
|
c8cc5278f3
|
Merge branch 'update-our-umbraco-url-references' of https://github.com/imranhaidercogworks/Umbraco-CMS into imranhaidercogworks-update-our-umbraco-url-references
|
2018-07-30 11:20:32 +02:00 |
|
BatJan
|
60c66823f8
|
Fix for PR #2792 - Selected color does not show in document type (#2817)
|
2018-07-30 10:11:57 +02:00 |
|
Sebastiaan Janssen
|
6a946c8a1c
|
Merge pull request #2816 from BatJan/features/temp-U4-11541
U4-11541 - Change the color pickers "active" appearance
|
2018-07-30 10:11:15 +02:00 |
|
Jan Skovgaard
|
9fa148db4f
|
Split the "check-circle" class out into it's own .less file for making it easier to re-use throughout the codebase making the color picker datatype use the same UI for the active state.
|
2018-07-28 13:35:35 +02:00 |
|
Jan Skovgaard
|
1c1a4778f9
|
Make sure to set min-width: auto - Otherwise the defined width will never be applied
|
2018-07-27 23:25:32 +02:00 |
|
Imran Haider
|
2660b31370
|
Updated our.umbraco.org to .com
|
2018-07-27 16:41:57 +01:00 |
|
Imran Haider
|
7baca85f6a
|
Update ourumbraco references to https
|
2018-07-27 16:08:38 +01:00 |
|
Richard Thompson
|
60910efc53
|
U4-10681 Restore option in media recycle bin (#2342)
|
2018-07-27 15:56:18 +02:00 |
|
BatJan
|
bd3f7ffcd4
|
U4-11538 Color picker thumbnail is to wide (#2801)
|
2018-07-27 14:35:04 +02:00 |
|
Callum Whyte
|
154d36e580
|
Cleanup of template query builder whitespace
|
2018-07-27 13:02:37 +01:00 |
|
Jan Skovgaard
|
b8af6f7987
|
Add title attributes to the "buttons" inside the umbConfirmAction directive providing translations for english and danish at the same time
|
2018-07-27 13:03:12 +02:00 |
|
Sébastien Sougnez
|
f7e097be8e
|
Minor update to the grid settings/style section (#2797)
|
2018-07-27 12:50:30 +02:00 |
|
BatJan
|
9b9173d64f
|
Use the umbConfirmAction directive when deleting tags (#2795)
|
2018-07-27 11:24:29 +02:00 |
|
Sebastiaan Janssen
|
26a49fbe9f
|
Fixes U4-9244
|
2018-07-26 15:55:33 +02:00 |
|
Sebastiaan Janssen
|
dffe33569a
|
Merge branch 'dev-v7' into dev-v7-U4-9025-2
|
2018-07-26 13:47:36 +02:00 |
|
Bjarne Fyrstenborg
|
c571284f40
|
Adjust a bit more styling
|
2018-07-26 11:50:31 +02:00 |
|
Bjarne Fyrstenborg
|
89c84c7a30
|
Set same width as for multivalues
|
2018-07-26 11:28:24 +02:00 |
|
Bjarne Fyrstenborg
|
d2e8b084f5
|
Remove width on label
|
2018-07-26 11:25:38 +02:00 |
|
Bjarne Fyrstenborg
|
99181d5bf4
|
Adjust thumbnail styling
|
2018-07-26 11:23:24 +02:00 |
|
Bjarne Fyrstenborg
|
0f3a8bff5d
|
Add consistency and a few localizations
|
2018-07-26 11:17:53 +02:00 |
|