diff options
52 files changed, 970 insertions, 555 deletions
diff --git a/js/package.json b/js/package.json index 2c4e7f9b5..d6a19bc28 100644 --- a/js/package.json +++ b/js/package.json @@ -25,13 +25,13 @@ "homepage": "https://github.com/owncloud/news", "devDependencies": { "grunt": "^0.4.5", - "grunt-contrib-concat": "^0.5.0", + "grunt-contrib-concat": "^0.5.1", "grunt-contrib-connect": "^0.9.0", - "grunt-contrib-cssmin": "^0.12.1", + "grunt-contrib-cssmin": "^0.12.2", "grunt-contrib-jshint": "^0.11.0", - "grunt-contrib-uglify": "^0.7.0", + "grunt-contrib-uglify": "^0.8.0", "grunt-contrib-watch": "^0.6.1", - "grunt-ng-annotate": "^0.9.2", + "grunt-ng-annotate": "^0.10.0", "grunt-php": "^1.2.0", "grunt-phpunit": "^0.3.6", "grunt-protractor-runner": "^1.2.1", diff --git a/js/vendor/angular-animate/.bower.json b/js/vendor/angular-animate/.bower.json index 98f52a2e6..929eae425 100644 --- a/js/vendor/angular-animate/.bower.json +++ b/js/vendor/angular-animate/.bower.json @@ -1,17 +1,17 @@ { "name": "angular-animate", - "version": "1.4.0-build.3834+sha.75725b4", + "version": "1.4.0-build.3861+sha.2c4ffd6", "main": "./angular-animate.js", "ignore": [], "dependencies": { - "angular": "1.4.0-build.3834+sha.75725b4" + "angular": "1.4.0-build.3861+sha.2c4ffd6" }, "homepage": "https://github.com/angular/bower-angular-animate", - "_release": "1.4.0-build.3834+sha.75725b4", + "_release": "1.4.0-build.3861+sha.2c4ffd6", "_resolution": { "type": "version", - "tag": "v1.4.0-build.3834+sha.75725b4", - "commit": "b8b576059be827b61bd3b8293b35bebbf3a6db1b" + "tag": "v1.4.0-build.3861+sha.2c4ffd6", + "commit": "be16ba6f29a5cab8d1099dbb08cfe923f727a6a3" }, "_source": "git://github.com/angular/bower-angular-animate.git", "_target": "~1.4.*", diff --git a/js/vendor/angular-animate/README.md b/js/vendor/angular-animate/README.md index 930b5dcc5..8313da67c 100644 --- a/js/vendor/angular-animate/README.md +++ b/js/vendor/angular-animate/README.md @@ -14,21 +14,12 @@ You can install this package either with `npm` or with `bower`. npm install angular-animate ``` -Add a `<script>` to your `index.html`: - -```html -<script src="/node_modules/angular-animate/angular-animate.js"></script> -``` - Then add `ngAnimate` as a dependency for your app: ```javascript -angular.module('myApp', ['ngAnimate']); +angular.module('myApp', [require('angular-animate')]); ``` -Note that this package is not in CommonJS format, so doing `require('angular-animate')` will -return `undefined`. - ### bower ```shell @@ -56,7 +47,7 @@ Documentation is available on the The MIT License -Copyright (c) 2010-2012 Google, Inc. http://angularjs.org +Copyright (c) 2010-2015 Google, Inc. http://angularjs.org Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/js/vendor/angular-animate/angular-animate.js b/js/vendor/angular-animate/angular-animate.js index b7af03dfd..1cd53aa8f 100644 --- a/js/vendor/angular-animate/angular-animate.js +++ b/js/vendor/angular-animate/angular-animate.js @@ -1,5 +1,5 @@ /** - * @license AngularJS v1.4.0-build.3834+sha.75725b4 + * @license AngularJS v1.4.0-build.3861+sha.2c4ffd6 * (c) 2010-2015 Google, Inc. http://angularjs.org * License: MIT */ diff --git a/js/vendor/angular-animate/angular-animate.min.js b/js/vendor/angular-animate/angular-animate.min.js index 0200df2ef..b0901fd51 100644 --- a/js/vendor/angular-animate/angular-animate.min.js +++ b/js/vendor/angular-animate/angular-animate.min.js @@ -1,5 +1,5 @@ /* - AngularJS v1.4.0-build.3834+sha.75725b4 + AngularJS v1.4.0-build.3861+sha.2c4ffd6 (c) 2010-2015 Google, Inc. http://angularjs.org License: MIT */ diff --git a/js/vendor/angular-animate/bower.json b/js/vendor/angular-animate/bower.json index fb3c4e276..d0a33bfd0 100644 --- a/js/vendor/angular-animate/bower.json +++ b/js/vendor/angular-animate/bower.json @@ -1,9 +1,9 @@ { "name": "angular-animate", - "version": "1.4.0-build.3834+sha.75725b4", + "version": "1.4.0-build.3861+sha.2c4ffd6", "main": "./angular-animate.js", "ignore": [], "dependencies": { - "angular": "1.4.0-build.3834+sha.75725b4" + "angular": "1.4.0-build.3861+sha.2c4ffd6" } } diff --git a/js/vendor/angular-animate/index.js b/js/vendor/angular-animate/index.js new file mode 100644 index 000000000..6ec0a3510 --- /dev/null +++ b/js/vendor/angular-animate/index.js @@ -0,0 +1,2 @@ +require('./angular-animate'); +module.exports = 'ngAnimate'; diff --git a/js/vendor/angular-animate/package.json b/js/vendor/angular-animate/package.json index 430c177f0..f5f4395db 100644 --- a/js/vendor/angular-animate/package.json +++ b/js/vendor/angular-animate/package.json @@ -1,8 +1,8 @@ { "name": "angular-animate", - "version": "1.4.0-build.3834+sha.75725b4", + "version": "1.4.0-build.3861+sha.2c4ffd6", "description": "AngularJS module for animations", - "main": "angular-animate.js", + "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/js/vendor/angular-mocks/.bower.json b/js/vendor/angular-mocks/.bower.json index a62603b1f..8733b39f7 100644 --- a/js/vendor/angular-mocks/.bower.json +++ b/js/vendor/angular-mocks/.bower.json @@ -1,17 +1,17 @@ { "name": "angular-mocks", - "version": "1.4.0-build.3834+sha.75725b4", + "version": "1.4.0-build.3861+sha.2c4ffd6", "main": "./angular-mocks.js", "ignore": [], "dependencies": { - "angular": "1.4.0-build.3834+sha.75725b4" + "angular": "1.4.0-build.3861+sha.2c4ffd6" }, "homepage": "https://github.com/angular/bower-angular-mocks", - "_release": "1.4.0-build.3834+sha.75725b4", + "_release": "1.4.0-build.3861+sha.2c4ffd6", "_resolution": { "type": "version", - "tag": "v1.4.0-build.3834+sha.75725b4", - "commit": "f18c3b4c618b11b79ec273d0d594f921af766239" + "tag": "v1.4.0-build.3861+sha.2c4ffd6", + "commit": "2bdbc872a7194935080ca6c2ece9d8969813ff70" }, "_source": "git://github.com/angular/bower-angular-mocks.git", "_target": "~1.4.*", diff --git a/js/vendor/angular-mocks/README.md b/js/vendor/angular-mocks/README.md index 1604ef880..440cce9b7 100644 --- a/js/vendor/angular-mocks/README.md +++ b/js/vendor/angular-mocks/README.md @@ -14,10 +14,16 @@ You can install this package either with `npm` or with `bower`. npm install angular-mocks ``` -The mocks are then available at `node_modules/angular-mocks/angular-mocks.js`. - -Note that this package is not in CommonJS format, so doing `require('angular-mocks')` will -return `undefined`. +You can `require` ngMock modules: + +```js +var angular = require('angular'); +angular.module('myMod', [ + require('angular-animate'), + require('angular-mocks/ngMock') + require('angular-mocks/ngAnimateMock') +]); +``` ### bower @@ -36,7 +42,7 @@ Documentation is available on the The MIT License -Copyright (c) 2010-2012 Google, Inc. http://angularjs.org +Copyright (c) 2010-2015 Google, Inc. http://angularjs.org Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/js/vendor/angular-mocks/angular-mocks.js b/js/vendor/angular-mocks/angular-mocks.js index 1320a3717..8adaba81e 100644 --- a/js/vendor/angular-mocks/angular-mocks.js +++ b/js/vendor/angular-mocks/angular-mocks.js @@ -1,5 +1,5 @@ /** - * @license AngularJS v1.4.0-build.3834+sha.75725b4 + * @license AngularJS v1.4.0-build.3861+sha.2c4ffd6 * (c) 2010-2015 Google, Inc. http://angularjs.org * License: MIT */ diff --git a/js/vendor/angular-mocks/bower.json b/js/vendor/angular-mocks/bower.json index 30f1baa2d..623f56bfc 100644 --- a/js/vendor/angular-mocks/bower.json +++ b/js/vendor/angular-mocks/bower.json @@ -1,9 +1,9 @@ { "name": "angular-mocks", - "version": "1.4.0-build.3834+sha.75725b4", + "version": "1.4.0-build.3861+sha.2c4ffd6", "main": "./angular-mocks.js", "ignore": [], "dependencies": { - "angular": "1.4.0-build.3834+sha.75725b4" + "angular": "1.4.0-build.3861+sha.2c4ffd6" } } diff --git a/js/vendor/angular-mocks/ngAnimateMock.js b/js/vendor/angular-mocks/ngAnimateMock.js new file mode 100644 index 000000000..6f99e62ef --- /dev/null +++ b/js/vendor/angular-mocks/ngAnimateMock.js @@ -0,0 +1,2 @@ +require('./angular-mocks'); +module.exports = 'ngAnimateMock'; diff --git a/js/vendor/angular-mocks/ngMock.js b/js/vendor/angular-mocks/ngMock.js new file mode 100644 index 000000000..7944de7d5 --- /dev/null +++ b/js/vendor/angular-mocks/ngMock.js @@ -0,0 +1,2 @@ +require('./angular-mocks'); +module.exports = 'ngMock'; diff --git a/js/vendor/angular-mocks/ngMockE2E.js b/js/vendor/angular-mocks/ngMockE2E.js new file mode 100644 index 000000000..fc2e539db --- /dev/null +++ b/js/vendor/angular-mocks/ngMockE2E.js @@ -0,0 +1,2 @@ +require('./angular-mocks'); +module.exports = 'ngMockE2E'; diff --git a/js/vendor/angular-mocks/package.json b/js/vendor/angular-mocks/package.json index 6525143d8..b5d3cc097 100644 --- a/js/vendor/angular-mocks/package.json +++ b/js/vendor/angular-mocks/package.json @@ -1,6 +1,6 @@ { "name": "angular-mocks", - "version": "1.4.0-build.3834+sha.75725b4", + "version": "1.4.0-build.3861+sha.2c4ffd6", "description": "AngularJS mocks for testing", "main": "angular-mocks.js", "scripts": { diff --git a/js/vendor/angular-route/.bower.json b/js/vendor/angular-route/.bower.json index d6cda2473..8ca74fbb2 100644 --- a/js/vendor/angular-route/.bower.json +++ b/js/vendor/angular-route/.bower.json @@ -1,17 +1,17 @@ { "name": "angular-route", - "version": "1.4.0-build.3834+sha.75725b4", + "version": "1.4.0-build.3861+sha.2c4ffd6", "main": "./angular-route.js", "ignore": [], "dependencies": { - "angular": "1.4.0-build.3834+sha.75725b4" + "angular": "1.4.0-build.3861+sha.2c4ffd6" }, "homepage": "https://github.com/angular/bower-angular-route", - "_release": "1.4.0-build.3834+sha.75725b4", + "_release": "1.4.0-build.3861+sha.2c4ffd6", "_resolution": { "type": "version", - "tag": "v1.4.0-build.3834+sha.75725b4", - "commit": "90391b09a91cc20b15e6f1bc2b9290ddfaefa9e6" + "tag": "v1.4.0-build.3861+sha.2c4ffd6", + "commit": "4a40fd1ba34f0f9c49d54ef0336bf80d69dfdbfc" }, "_source": "git://github.com/angular/bower-angular-route.git", "_target": "~1.4.*", diff --git a/js/vendor/angular-route/README.md b/js/vendor/angular-route/README.md index b33a0dc33..2cd4f9091 100644 --- a/js/vendor/angular-route/README.md +++ b/js/vendor/angular-route/README.md @@ -14,21 +14,12 @@ You can install this package either with `npm` or with `bower`. npm install angular-route ``` -Add a `<script>` to your `index.html`: - -```html -<script src="/node_modules/angular-route/angular-route.js"></script> -``` - Then add `ngRoute` as a dependency for your app: ```javascript -angular.module('myApp', ['ngRoute']); +angular.module('myApp', [require('angular-route')]); ``` -Note that this package is not in CommonJS format, so doing `require('angular-route')` will -return `undefined`. - ### bower ```shell @@ -56,7 +47,7 @@ Documentation is available on the The MIT License -Copyright (c) 2010-2012 Google, Inc. http://angularjs.org +Copyright (c) 2010-2015 Google, Inc. http://angularjs.org Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/js/vendor/angular-route/angular-route.js b/js/vendor/angular-route/angular-route.js index 189fd6c75..643a485ba 100644 --- a/js/vendor/angular-route/angular-route.js +++ b/js/vendor/angular-route/angular-route.js @@ -1,5 +1,5 @@ /** - * @license AngularJS v1.4.0-build.3834+sha.75725b4 + * @license AngularJS v1.4.0-build.3861+sha.2c4ffd6 * (c) 2010-2015 Google, Inc. http://angularjs.org * License: MIT */ diff --git a/js/vendor/angular-route/angular-route.min.js b/js/vendor/angular-route/angular-route.min.js index 3a390266c..64ef25939 100644 --- a/js/vendor/angular-route/angular-route.min.js +++ b/js/vendor/angular-route/angular-route.min.js @@ -1,5 +1,5 @@ /* - AngularJS v1.4.0-build.3834+sha.75725b4 + AngularJS v1.4.0-build.3861+sha.2c4ffd6 (c) 2010-2015 Google, Inc. http://angularjs.org License: MIT */ diff --git a/js/vendor/angular-route/bower.json b/js/vendor/angular-route/bower.json index aac578566..8f177498c 100644 --- a/js/vendor/angular-route/bower.json +++ b/js/vendor/angular-route/bower.json @@ -1,9 +1,9 @@ { "name": "angular-route", - "version": "1.4.0-build.3834+sha.75725b4", + "version": "1.4.0-build.3861+sha.2c4ffd6", "main": "./angular-route.js", "ignore": [], "dependencies": { - "angular": "1.4.0-build.3834+sha.75725b4" + "angular": "1.4.0-build.3861+sha.2c4ffd6" } } diff --git a/js/vendor/angular-route/index.js b/js/vendor/angular-route/index.js new file mode 100644 index 000000000..9ed2645e4 --- /dev/null +++ b/js/vendor/angular-route/index.js @@ -0,0 +1,2 @@ +require('./angular-route'); +module.exports = 'ngRoute'; diff --git a/js/vendor/angular-route/package.json b/js/vendor/angular-route/package.json index 81f1147e7..c6e47b10e 100644 --- a/js/vendor/angular-route/package.json +++ b/js/vendor/angular-route/package.json @@ -1,8 +1,8 @@ { "name": "angular-route", - "version": "1.4.0-build.3834+sha.75725b4", + "version": "1.4.0-build.3861+sha.2c4ffd6", "description": "AngularJS router module", - "main": "angular-route.js", + "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/js/vendor/angular-sanitize/.bower.json b/js/vendor/angular-sanitize/.bower.json index 085856d40..d7c943f00 100644 --- a/js/vendor/angular-sanitize/.bower.json +++ b/js/vendor/angular-sanitize/.bower.json @@ -1,17 +1,17 @@ { "name": "angular-sanitize", - "version": "1.4.0-build.3834+sha.75725b4", + "version": "1.4.0-build.3861+sha.2c4ffd6", "main": "./angular-sanitize.js", "ignore": [], "dependencies": { - "angular": "1.4.0-build.3834+sha.75725b4" + "angular": "1.4.0-build.3861+sha.2c4ffd6" }, "homepage": "https://github.com/angular/bower-angular-sanitize", - "_release": "1.4.0-build.3834+sha.75725b4", + "_release": "1.4.0-build.3861+sha.2c4ffd6", "_resolution": { "type": "version", - "tag": "v1.4.0-build.3834+sha.75725b4", - "commit": "a98d35686b3030a78a52a1fea3e9a199febac453" + "tag": "v1.4.0-build.3861+sha.2c4ffd6", + "commit": "83ee1f28e0dfdc29868cc3969296fa150021219c" }, "_source": "git://github.com/angular/bower-angular-sanitize.git", "_target": "~1.4.*", diff --git a/js/vendor/angular-sanitize/README.md b/js/vendor/angular-sanitize/README.md index 6bc0a3013..b84aaf6db 100644 --- a/js/vendor/angular-sanitize/README.md +++ b/js/vendor/angular-sanitize/README.md @@ -14,21 +14,12 @@ You can install this package either with `npm` or with `bower`. npm install angular-sanitize ``` -Add a `<script>` to your `index.html`: - -```html -<script src="/node_modules/angular-sanitize/angular-sanitize.js"></script> -``` - Then add `ngSanitize` as a dependency for your app: ```javascript -angular.module('myApp', ['ngSanitize']); +angula |