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 #15020 from MegaphoneJon/core-1182-517
[civicrm-core.git]
/
bower.json
diff --git
a/bower.json
b/bower.json
index b970b3e9ada7cdee86e1684673f56d0332942401..75e67552ef9e45a1fb85bc5491478d3526c406ee 100644
(file)
--- a/
bower.json
+++ b/
bower.json
@@
-18,7
+18,7
@@
"d3-3.5.x": "d3#~3.5.17",
"dc-2.1.x": "dc.js#~2.1.8",
"crossfilter-1.3.x": "crossfilter2#~1.3.11",
"d3-3.5.x": "d3#~3.5.17",
"dc-2.1.x": "dc.js#~2.1.8",
"crossfilter-1.3.x": "crossfilter2#~1.3.11",
- "jquery": "
~1.1
2",
+ "jquery": "
civicrm/jquery#1.12.4-civicrm-1.
2",
"jquery-ui": "~1.12",
"lodash-compat": "~3.0",
"google-code-prettify": "~1.0",
"jquery-ui": "~1.12",
"lodash-compat": "~3.0",
"google-code-prettify": "~1.0",
@@
-32,9
+32,13
@@
"angular-sanitize": "~1.5.0",
"smartmenus": "~1.1",
"phantomjs-polyfill": "^0.0.2",
"angular-sanitize": "~1.5.0",
"smartmenus": "~1.1",
"phantomjs-polyfill": "^0.0.2",
- "es6-promise": "^4.2.4"
+ "es6-promise": "^4.2.4",
+ "angular-xeditable": "^0.9.0",
+ "checklist-model": "~1",
+ "css-color-names": "~1"
},
"resolutions": {
},
"resolutions": {
- "angular": "~1.5.11"
+ "angular": "~1.5.11",
+ "jquery": "1.12.4-civicrm-1.2"
}
}
}
}