Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit 6b73990

Browse files
committed
Merge branch 'z6peb-angular1' into angular1
2 parents 672cb83 + 18081d6 commit 6b73990

25 files changed

+6837
-2862
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"dtColumns.json"
5151
],
5252
"dependencies": {
53-
"angular": "~1.6.0",
53+
"angular": "~1.7.0",
5454
"datatables.net": ">=1.10.9",
5555
"datatables.net-dt": ">=1.10.9",
5656
"jquery": ">=1.11.0"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"dtColumns.json"
3434
],
3535
"dependencies": {
36-
"angular": ">=1.6.0",
36+
"angular": ">=1.7.0",
3737
"datatables.net": "^1.10.11",
3838
"datatables.net-dt": "^1.10.11",
3939
"jquery": ">=1.11.0"

vendor/angular-translate/.bower.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"name": "angular-translate",
33
"description": "A translation module for AngularJS",
4-
"version": "2.13.1",
4+
"version": "2.18.1",
55
"main": "./angular-translate.js",
66
"ignore": [],
77
"author": "Pascal Precht",
88
"license": "MIT",
99
"dependencies": {
10-
"angular": ">=1.2.26 <1.6"
10+
"angular": ">=1.2.26 <1.8"
1111
},
1212
"homepage": "https://github.com/PascalPrecht/bower-angular-translate",
13-
"_release": "2.13.1",
13+
"_release": "2.18.1",
1414
"_resolution": {
1515
"type": "version",
16-
"tag": "2.13.1",
17-
"commit": "fcbbbd5d8a9e30651ec4c847a0bfdb9e03b2ce6f"
16+
"tag": "2.18.1",
17+
"commit": "a37d868d24a8aee0eabd457773e1d35297e9bd4f"
1818
},
1919
"_source": "https://github.com/PascalPrecht/bower-angular-translate.git",
20-
"_target": "^2.13.1",
20+
"_target": "2.18.1",
2121
"_originalSource": "angular-translate",
2222
"_direct": true
2323
}

vendor/angular-translate/angular-translate.js

Lines changed: 222 additions & 130 deletions
Large diffs are not rendered by default.

vendor/angular-translate/angular-translate.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/angular-translate/bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "angular-translate",
33
"description": "A translation module for AngularJS",
4-
"version": "2.13.1",
4+
"version": "2.18.1",
55
"main": "./angular-translate.js",
66
"ignore": [],
77
"author": "Pascal Precht",
88
"license": "MIT",
99
"dependencies": {
10-
"angular": ">=1.2.26 <1.6"
10+
"angular": ">=1.2.26 <1.8"
1111
}
1212
}

vendor/angular/.bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"name": "angular",
3-
"version": "1.6.1",
3+
"version": "1.7.3",
44
"license": "MIT",
55
"main": "./angular.js",
66
"ignore": [],
77
"dependencies": {},
88
"homepage": "https://github.com/angular/bower-angular",
9-
"_release": "1.6.1",
9+
"_release": "1.7.3",
1010
"_resolution": {
1111
"type": "version",
12-
"tag": "v1.6.1",
13-
"commit": "3828060389c83384b0a162eea82b21f183aa060c"
12+
"tag": "v1.7.3",
13+
"commit": "dbf96678470a684d972c44adce8a4b5c45351e4a"
1414
},
1515
"_source": "https://github.com/angular/bower-angular.git",
16-
"_target": "1.6.1",
16+
"_target": "~1.7.0",
1717
"_originalSource": "angular"
1818
}

vendor/angular/angular-csp.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22

33
@charset "UTF-8";
44

5-
[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
6-
.ng-cloak, .x-ng-cloak,
5+
[ng\:cloak],
6+
[ng-cloak],
7+
[data-ng-cloak],
8+
[x-ng-cloak],
9+
.ng-cloak,
10+
.x-ng-cloak,
711
.ng-hide:not(.ng-hide-animate) {
812
display: none !important;
913
}

0 commit comments

Comments
 (0)