X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=bower.json;h=c4aaaa21526f2fdbdf86aca5ca65d78e68520987;hb=26050aeb18e39c771b0bd2bb09614900ffb0923c;hp=fbd2229b43449f989b5db64bb91c6c0b3a8cfd6a;hpb=fe9c4c348471c65fe38206424582a1873af1315a;p=civicrm-core.git diff --git a/bower.json b/bower.json index fbd2229b43..c4aaaa2152 100644 --- 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", - "jquery": "~1.12", + "jquery": "civicrm/jquery#1.12.4-civicrm-1.1", "jquery-ui": "~1.12", "lodash-compat": "~3.0", "google-code-prettify": "~1.0", @@ -30,9 +30,12 @@ "font-awesome": "~4", "angular-bootstrap": "^2.5.0", "angular-sanitize": "~1.5.0", - "phantomjs-polyfill": "^0.0.2" + "smartmenus": "~1.1", + "phantomjs-polyfill": "^0.0.2", + "es6-promise": "^4.2.4" }, "resolutions": { - "angular": "~1.5.11" + "angular": "~1.5.11", + "jquery": "1.12.4-civicrm-1.1" } }