Commit Graph

63 Commits

Author SHA1 Message Date
Chris Houston
941ede776b Corrected all the miss spellings of:
Seperator -> Separator
Seperate -> Separate
2019-01-17 13:16:43 +01:00
Warren Buckley
8f1cd8110d Adds in the missing chart.js & wrapper lib (part of it was put in the solution it seems but not fully merged in correctly perhaps?!) 2019-01-11 13:27:39 +00:00
Mads Rasmussen
3a839ca1ef don't ship with moments libraries including locales 2018-11-29 14:24:15 +01:00
Mads Rasmussen
45feb9577d get spectrum color picker from npm + get latest version 2018-11-29 13:30:37 +01:00
Mads Rasmussen
e4a4a17739 get jquery touch punch from npm 2018-11-28 15:34:51 +01:00
Mads Rasmussen
df193987c4 add back jquery-ui and remove jquery-migrate 2018-11-28 15:18:14 +01:00
Mads Rasmussen
4e29a3709d upgrade jquery + temp add jquery migrate + temp remove other jquery libraries 2018-11-28 13:16:26 +01:00
Mads Rasmussen
f956a035a1 remove jquery validation libraries 2018-11-28 13:12:00 +01:00
Mads Rasmussen
d6b24ac92d Merge branch 'temp8' into temp8-remove-bootstrap-slider
# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
2018-11-26 14:10:57 +01:00
Mads Rasmussen
f24a347b01 load in new slider + basic setup 2018-11-22 10:06:00 +01:00
Shannon
08dc94a535 Merge branch 'temp8' into temp-tinymce
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
2018-11-22 15:38:58 +11:00
Kenn Jacobsen
2f643259c8 Include the rest of the CSS assets for the ACE editor 2018-11-01 13:31:31 +01:00
Kenn Jacobsen
a3232bb55c WIP: split editing into tabs 2018-10-31 21:33:32 +01:00
Chris Houston
c401782d5e Added clean-css to the client side build process (#3371) 2018-10-21 16:27:39 +02:00
Bjarne Fyrstenborg
8e1065a2b6 Fix missing semicolons and remove comma at end 2018-10-19 15:08:17 +02:00
Warren Buckley
66d4541fc5 Remove codemirror files 2018-10-12 14:20:21 +01:00
Warren Buckley
e2c16f15da Adds in skins for tinymce 2018-10-11 15:19:32 +01:00
Mads Rasmussen
4f00082dd5 fix angular mocks 2018-10-11 15:06:12 +02:00
Mads Rasmussen
e390d28e29 fix jquery-ui 2018-10-11 14:34:02 +02:00
Warren Buckley
ecaedc547a Fixes moment locale copying 2018-10-11 13:31:54 +01:00
Mads Rasmussen
7a372bf814 fix lazyload 2018-10-11 13:50:52 +02:00
Mads Rasmussen
efefa54601 remove all bower logic in gulp + remove bower.json 2018-10-11 13:26:21 +02:00
Mads Rasmussen
bb5817ca92 fixing versions and files 2018-10-11 13:12:10 +02:00
Mads Rasmussen
bd20518d50 move the last dependencies 2018-10-11 12:16:09 +02:00
Mads Rasmussen
a0c7a45a4c move, move, move all day loong... 2018-10-11 10:44:14 +02:00
Mads Rasmussen
37d14f7413 moving moments + angular-dynamic-locale 2018-10-11 09:46:23 +02:00
Mads Rasmussen
4d13c631ed aaand move some more 2018-10-10 21:29:42 +02:00
Mads Rasmussen
a4903b9581 get jquery libraries to npm 2018-10-10 20:58:35 +02:00
Mads Rasmussen
91d8b40216 move more libraries 2018-10-09 21:29:50 +02:00
Mads Rasmussen
5dd6ef18aa first round of moving libraries from bower to npm 2018-10-09 20:48:20 +02:00
Mads Rasmussen
369971bf5f Merge branch 'temp8' into temp8-babel 2018-10-09 15:35:59 +02:00
Mads Rasmussen
8c52529e47 add babel + babel config 2018-10-07 20:01:20 +02:00
Mads Rasmussen
90900067a8 wip Add flatpickr library + create flatpickr component 2018-10-07 15:29:24 +02:00
Shannon
e771e781dd finally it actually previews 2018-09-14 00:14:03 +10:00
Stephan
69e8b11a79 Fix tests 2018-09-07 11:43:57 +02:00
Shannon
284e440b7e Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/config/canvasdesigner.config.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/border.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/margin.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/padding.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/radius.js
#	src/Umbraco.Web.UI.Client/src/canvasdesigner/lib/spectrum.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umblaunchminieditor.directive.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
2018-08-09 15:22:20 +10:00
Mads Rasmussen
c73860d144 start eslint from scratch so we slowly can add more rules for easier merging to v8 2018-08-08 19:52:00 +02: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
Imran Haider
2660b31370 Updated our.umbraco.org to .com 2018-07-27 16:41:57 +01:00
Shannon
feb16f901f Updates some JS dependencies, moves more dependencies to bower instead of having them committed, ensures angular locales are workgin with 1.7, upgrades to angular 1.7.2 2018-06-15 11:42:43 +10:00
Shannon Deminick
80c585c21e Temp8 validation fixing (#2699)
* Showing notifications if any for any response with status 400 >= x < 500.

* fixes valFormManager

* Updates logic for the valpropertymsg.directive to simplify it and so that it doesn't need to query the DOM which was causing issues with timing.

* commits package-lock

* fixes some issues with the securityinterceptor, properly nests promises in contentEditingHelper, fixes errors occuring when not handling promise rejections due to validation problems,

* another unhandled potential validation problem

* Merge branch 'temp-U4-7757' of https://github.com/lars-erik/Umbraco-CMS into lars-erik-temp-U4-7757

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js

* cleans up the interceptor objects and puts them in appropriate modules and files, centralizes the logic to show notifications so that only happens in one place.

* Fixes more places where notifications were manually shown.

* Fixes validation with the variant publishing overlay and html descrepencies
2018-06-15 10:33:16 +10:00
Peter Duncanson
3743fc1c29 Added Gulp Images to compress images as part of the front end build process 2018-05-31 13:37:24 +01:00
Claus
0ee3ebd180 adding the preview controller to project.
removing old static html files from src (they're now cshtml files in Views).
copy task should not copy static canvasdesigner files anymore.
2018-02-28 08:58:16 +01:00
Sebastiaan Janssen
c321d6dd44 Adds files missing from build output 2017-09-18 16:52:43 +02:00
Mads Rasmussen
9c2b0a3ef6 fixes: U4-10413 Composition/Reorder bar gets in the way when editing or adding a property 2017-09-14 11:04:34 +02:00
Sebastiaan Janssen
32999b7e19 Correction, we don't need this file after all :-) 2017-09-08 14:58:50 +02:00
Sebastiaan Janssen
ce63251206 Adds missing file to gulp build 2017-09-08 14:53:33 +02:00
Mads Rasmussen
35fc997d9f fix stylesheets for canvas designer/preview 2017-09-08 13:13:26 +02:00
Mads Rasmussen
110a3b2a12 add small interval to file watcher to keep windows calm 2017-08-29 14:35:54 +02:00
Mads Rasmussen
1bda9f32c1 only copy minified version of font-awesome 2017-08-29 14:27:43 +02:00