yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,573 Commits 4 Branches 7 Tags
e0610fc85d94bb9e54b1645e6e3b7a618b2aabbc
Commit Graph

37 Commits

Author SHA1 Message Date
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
Mads Rasmussen
c0b06a4cec Added grunt-postcss to auto-prefix the css files + minify all css files. 2015-08-24 12:22:51 +02:00
Per Ploug
fc323ae89d Include EsLint in grunt 
ESlint is not turned on by default - as it gives us 500ish errors as of
the current state of the codebase, also, we should start linting
controllers (why arent we?)

EsLint contains angular best practices rules and will help us get V8
ready for Angular2 and to follow best practices, untill everything
passes we can turn it on and off during clean-up time
 2015-06-25 11:49:00 +02:00
Shannon
8f4da31f0b removes old grunt-bower task. 2015-06-24 11:34:50 +02:00
Shannon
fde162b086 Fixes up bower installer, no longer using grunt-bower-task since it is old and doesn't support the copying that we need, updates to latest bower dependency 2015-06-24 11:15:04 +02:00
Shannon
be84db097a Fixes: U4-6599 TinyMCE autoresize plugin has a bug and needs to be updated, U4-5689 update to latest TinyMCE 4.x version 2015-06-17 15:06:34 +02:00
Shannon
201464cb44 Fixes: U4-5918 Update Underscore.js and also updates our usage of bower with the correct grunt-bower plugin, this massively simplifies bower usage and paves the way to start using bower for all JS components. 2015-01-02 14:25:11 +11:00
Shannon
27e6b8c80c Adds bower to node dependencies, uses bower to get the typeahead dependency, gets bower dependencies on npm install 2014-05-05 15:55:48 +10:00
per ploug
e3c4ed5bf7 Changes grunt to accept a buildversion param 
use grunt build --buildversion=7.1.2 to set it in all client files
 2014-04-10 14:25:26 +02:00
Per Ploug Krogslund
de97d8849a Fixes broken unit tests 2014-02-26 15:51:09 +01:00
Per Ploug Krogslund
7440855c72 merge 2013-11-07 17:16:22 +01:00
perploug
998bc73a90 version number change in pakcage.json 2013-11-01 12:29:12 +01:00
perploug
ac4eb18b55 Add ngmin and uglify to grunt setup RERUN NPM INSTALL 2013-09-04 23:31:05 +02:00
perploug
e825c08901 Added events.Service and xmlhelper.service 2013-08-12 15:17:34 +02:00
Shannon
cdf114df4b Converted all resources over to use a newer structure for generating URLs, created unit tests for those, fixed the js build so that the name is still "umbraco" not "umbraco 7" since that causes problems with css and other file references. 2013-07-12 13:26:11 +10:00
Per Ploug Krogslund
cfd4ded456 Start on property editor tutorial 2013-07-11 22:13:16 +02:00
Per Ploug Krogslund
245c764bf1 docs on navigationService 
working ngDocs setup, started adding docs to navigation and dialog
service
 2013-07-09 22:17:23 +02:00
Per Ploug
d2273ee8ce Updated karma to 0.9 
Tests are now cross-platform and runs in local phantomJS instead of in
chrome, remember to run npm install to upgrade
 2013-06-26 15:46:36 +02:00
Per Ploug Krogslund
47f1dcf4e5 Missing client files, excluding node_modules 2013-06-10 10:44:40 -02:00