Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenaka <diosmosis@users.noreply.github.com>2017-09-11 16:07:37 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2017-09-11 16:07:37 +0300
commit1092e4d7290333591f0f9beead6580a1424bc99f (patch)
tree5637e6dae005d1f68eae3dd7deaba7b87c522f89 /bower.json
parentc7bea894a7cbb0d70f9c22f5197123935f392475 (diff)
Updating Angular to version 1.6 (#11857)
* Update angular to 1.6 and ngDialog to 1.3. * Remove broken Function.bind polyfill from kartograph that clashes w/ angular 1.6. * $http.method().success/error functions do not exist in angular 1.6, just use standard promise interface. * Maintain empty hash prefix for existing Piwik links. See https://docs.angularjs.org/guide/migration#commit-aa077e8 for more info. * Make sure radio setting values match availableValue values exactly. Angular 1.6 uses strict equals when matching ng-value values w/ ng-model values, and the available values for boolean radio settings is always '0' or '1'. So we have to make sure the field value is '0'/'1'. * Feedback form UI test code to remove piwik version string selected wrong element. * Update expected screenshots (minor changes + unexplained default SMS provider change).
Diffstat (limited to 'bower.json')
-rw-r--r--bower.json17
1 files changed, 10 insertions, 7 deletions
diff --git a/bower.json b/bower.json
index bf88bc001c..15444c6a7f 100644
--- a/bower.json
+++ b/bower.json
@@ -15,12 +15,12 @@
"dependencies": {
"jquery-ui": "1.10.4",
"jquery": "~2.2.0",
- "angular": "~1.4.0",
- "angular-sanitize": "~1.4.0",
- "angular-animate": "~1.4.0",
- "angular-cookies": "~1.4.0",
- "angular-mocks": "~1.4.0",
- "ngDialog": "~0.2.0",
+ "angular": "~1.6.0",
+ "angular-sanitize": "~1.6.0",
+ "angular-animate": "~1.6.0",
+ "angular-cookies": "~1.6.0",
+ "angular-mocks": "~1.6.0",
+ "ngDialog": "~1.3.0",
"html5shiv": "~3.7.0",
"mousetrap": "~1.4.0",
"sprintf": "~1.0.0",
@@ -37,5 +37,8 @@
"**/.*",
"node_modules",
"tests"
- ]
+ ],
+ "resolutions": {
+ "angular": "~1.6.0"
+ }
}