swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,287 Commits 73 Branches 219 Tags
7eee1ac76cc25ab2845daaf65b0069dbfb85aedd
Commit Graph

68 Commits

Author SHA1 Message Date
Warren Buckley 7eee1ac76c Merge remote-tracking branch 'origin/temp8-tinymce' into temp8-logviewer 2018-11-22 14:18:58 +00: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
Warren Buckley dce485bc6f Adds chartjs & the angular wrapper lib to package.json now that bower has been removed 2018-10-29 10:41:58 +00:00
Shannon 93a52432cf Manual merging 2018-10-22 17:04:58 +11:00
Chris Houston c401782d5e Added clean-css to the client side build process (#3371) 2018-10-21 16:27:39 +02:00
Warren Buckley 66d4541fc5 Remove codemirror files 2018-10-12 14:20:21 +01:00
Warren Buckley 0e8c5f48fe tinymce to correct version - 4.8.3 2018-10-11 15:14:33 +01:00
Warren Buckley a275b47139 npm install of tinymce 2018-10-11 15:12:05 +01:00
Mads Rasmussen 6071be79be set private to true in package.json. We don't need to publish on npm 2018-10-11 14:50:34 +02:00
Mads Rasmussen e390d28e29 fix jquery-ui 2018-10-11 14:34:02 +02:00
Warren Buckley ac5ee9053f Update & match momentjs version 2018-10-11 13:32:15 +01:00
Mads Rasmussen a00875089c get the right version of ace 2018-10-11 14:10:18 +02:00
Mads Rasmussen 09f67c6c43 fix version 2018-10-11 13:26:35 +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 a78230e135 lock version of flatpickr 2018-10-09 09:46:17 +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
Stephan 61a926e7e6 Cleanup npm package[-log].json files 2018-10-03 14:44:08 +02:00
Shannon edc9744397 manual merge pass #1 2018-10-02 11:14:04 +02:00
Shannon b96ba05d22 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	build/NuSpecs/UmbracoCms.nuspec
#	build/NuSpecs/tools/Readme.txt
#	src/Umbraco.Core/Configuration/UmbracoConfig.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/Constants-Conventions.cs
#	src/Umbraco.Core/Constants-System.cs
#	src/Umbraco.Core/IO/MediaFileSystem.cs
#	src/Umbraco.Core/Media/Exif/ImageFile.cs
#	src/Umbraco.Core/Models/Property.cs
#	src/Umbraco.Core/Models/PropertyTagBehavior.cs
#	src/Umbraco.Core/Models/PropertyTags.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/SetDefaultTagsStorageType.cs
#	src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Security/AuthenticationExtensions.cs
#	src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
#	src/Umbraco.Core/Services/Implement/PackagingService.cs
#	src/Umbraco.Core/Services/ServerRegistrationService.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Tests/ApplicationUrlHelperTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/user.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/components/card.less
#	src/Umbraco.Web.UI.Client/src/less/navs.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
#	src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
#	src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/CanvasDesignerController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
#	src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
#	src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs
#	src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
#	src/Umbraco.Web/Mvc/MasterControllerFactory.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
#	src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
#	src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
#	src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
#	src/Umbraco.Web/Scheduling/KeepAlive.cs
#	src/Umbraco.Web/Scheduling/LogScrubber.cs
#	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
#	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
#	src/Umbraco.Web/Scheduling/Scheduler.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/Trees/DataTypeTreeController.cs
#	src/Umbraco.Web/UmbracoModule.cs
#	src/Umbraco.Web/_Legacy/Packager/Installer.cs
#	src/Umbraco.Web/packages.config
#	src/Umbraco.Web/umbraco.presentation/keepAliveService.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
#	src/umbraco.businesslogic/IO/IOHelper.cs
#	src/umbraco.cms/packages.config
#	src/umbraco.cms/umbraco.cms.csproj
#	src/umbraco.controls/packages.config
#	src/umbraco.controls/umbraco.controls.csproj
#	src/umbraco.editorControls/packages.config
#	src/umbraco.editorControls/umbraco.editorControls.csproj
 2018-10-01 14:32:46 +02:00
Sebastiaan Janssen 258baad127 Removed uneccessary properties 2018-09-26 22:01:09 +02:00
Chris Houston 0e6376f4e5 Updated the URL for the issue tracker. 
Also updated the version number to reflect the current version.
 2018-09-26 21:58:05 +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 6d0307cdc7 updates to latest jasmine removes unit tests that weren't testing anything and one that was failing 2018-06-15 13:54:01 +10:00
Sebastiaan Janssen 9008e6af88 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	docs/CONTRIBUTING_DETAILED.md
#	docs/README.md
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
#	src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
#	src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/LanguageTreeController.cs
 2018-06-06 21:15:11 +02: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
Stephan f7a14a03f2 Fix build, still some weird csc.exe versionning 2018-04-04 17:41:55 +02:00
Shannon b361cfebb7 updates npm build dependencies 2018-03-21 13:55:01 +11:00
Warren Buckley e17f75a18a Update client build NPM dependancy for gulp-connect to use 5.0.0 as next/latest version required you to use CoffeeScript to compile their src code to use the module/component 2018-01-03 11:56:39 +00:00
Shannon 65b44137d4 Fixes JS unit test runner 2017-09-12 16:02:40 +10:00
Sebastiaan Janssen e511554a42 Adds less as a dependency so that the build can complete 2017-09-04 20:10:19 +02:00
Mads Rasmussen ce8390768e Source maps gets cached really hard in the browser so I will remove them for now until we find a solution to clear them 2017-08-29 14:17:41 +02:00
Mads Rasmussen aa5d7fc9fc only use source maps when developing 2017-08-28 15:42:31 +02:00
Mads Rasmussen 0089f79bd7 add tasks for ngdocs 2017-08-25 14:22:42 +02:00
Per Ploug babcbd2f7a Updates from dev-v7 2017-08-07 15:29:34 +02:00
Per Ploug e35a748c92 Fixes issues with missing angular modules and adds sourcemap support 2017-06-27 17:00:00 +02:00
Per Ploug 5cee5a27c9 Wraps tasks in a merge-stream 
This ensures proper timing and feedback of tasks
 2017-01-09 15:26:05 +01:00
Per Ploug 6be9a25d99 new package.json to support gulp 2017-01-07 01:24:32 +01:00
Sebastiaan Janssen 166429cf68 Fixes the "No license field." error, see: 
https://github.com/npm/npm/issues/4473#issuecomment-103453246
 2016-02-04 16:10:35 +01:00
Per Ploug d8fc73d36b Grunt and npm file for experiment view cache 2015-10-16 15:16:40 +02:00