projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #8101 from colemanw/CRM-18379
[civicrm-core.git]
/
bower.json
diff --git
a/bower.json
b/bower.json
index 61f93dacde68a3e1bfd5988709401130bb9e66a2..11b68796101141ad8b735b9ed520f9223781e75c 100644
(file)
--- a/
bower.json
+++ b/
bower.json
@@
-6,7
+6,7
@@
"private": true,
"dependencies": {
"angular": "~1.3.8",
"private": true,
"dependencies": {
"angular": "~1.3.8",
- "angular-file-upload": "
~1.1.5
",
+ "angular-file-upload": "
>=1.1.5 <=1.1.6
",
"angular-jquery-dialog-service": "totten/angular-jquery-dialog-service#civicrm",
"angular-mocks": "~1.3.8",
"angular-route": "~1.3.8",
"angular-jquery-dialog-service": "totten/angular-jquery-dialog-service#civicrm",
"angular-mocks": "~1.3.8",
"angular-route": "~1.3.8",
@@
-17,7
+17,14
@@
"d3": "3.4.11",
"jquery": "~1.11",
"jquery-ui": "~1.11",
"d3": "3.4.11",
"jquery": "~1.11",
"jquery-ui": "~1.11",
- "lodash-compat": "~3.0"
+ "lodash-compat": "~3.0",
+ "google-code-prettify": "~1.0",
+ "select2": "colemanw/select2#stable/3.5",
+ "jquery-validation": "~1.13",
+ "datatables": "~1.10",
+ "ckeditor": "~4.5",
+ "font-awesome": "~4.4",
+ "angular-sanitize": "~1.3.15"
},
"resolutions": {
"angular": "~1.3.8"
},
"resolutions": {
"angular": "~1.3.8"