projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ec42134
)
(security/core#50) Update jQuery to address prototype pollution
author
Tim Otten
<totten@civicrm.org>
Tue, 23 Apr 2019 23:00:35 +0000
(16:00 -0700)
committer
Seamus Lee
<seamuslee001@gmail.com>
Tue, 14 May 2019 21:44:41 +0000
(07:44 +1000)
bower.json
patch
|
blob
|
blame
|
history
diff --git
a/bower.json
b/bower.json
index b970b3e9ada7cdee86e1684673f56d0332942401..c4aaaa21526f2fdbdf86aca5ca65d78e68520987 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",
- "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",
@@
-35,6
+35,7
@@
"es6-promise": "^4.2.4"
},
"resolutions": {
- "angular": "~1.5.11"
+ "angular": "~1.5.11",
+ "jquery": "1.12.4-civicrm-1.1"
}
}