Commit 7f842c42 authored by JC Brand's avatar JC Brand

Update some bower dependencies and rebuilt dist files

fixes #437
parent f55ab176
...@@ -25,6 +25,9 @@ JSHINTEXCEPTIONS = $(GENERATED) \ ...@@ -25,6 +25,9 @@ JSHINTEXCEPTIONS = $(GENERATED) \
src/bigint.js src/bigint.js
CHECKSOURCES = $(filter-out $(JSHINTEXCEPTIONS),$(SOURCES)) CHECKSOURCES = $(filter-out $(JSHINTEXCEPTIONS),$(SOURCES))
.PHONY: all
all: dev
.PHONY: help .PHONY: help
help: help:
@echo "Please use \`make <target>' where <target> is one of the following:" @echo "Please use \`make <target>' where <target> is one of the following:"
...@@ -50,8 +53,6 @@ help: ...@@ -50,8 +53,6 @@ help:
@echo " stamp-bundler Install Bundler (Ruby) dependencies and create the guard file stamp-bundler which will prevent those dependencies from being installed again." @echo " stamp-bundler Install Bundler (Ruby) dependencies and create the guard file stamp-bundler which will prevent those dependencies from being installed again."
@echo " watch Tells Sass to watch the .scss files for changes and then automatically update the CSS files." @echo " watch Tells Sass to watch the .scss files for changes and then automatically update the CSS files."
.PHONY: all
all: dev
######################################################################## ########################################################################
## Miscellaneous ## Miscellaneous
......
...@@ -8,29 +8,31 @@ ...@@ -8,29 +8,31 @@
"sinon": "^1.17.3" "sinon": "^1.17.3"
}, },
"dependencies": { "dependencies": {
"requirejs": "~2.1.15", "requirejs": "~2.2.0",
"jquery": "1.11.0", "jquery": "1.12.2",
"jed": "0.5.4", "jed": "1.1.0",
"underscore": "~1.8.3", "underscore": "~1.8.3",
"backbone": "1.1.2", "backbone": "1.1.2",
"backbone.browserStorage": "0.0.2", "backbone.browserStorage": "0.0.2",
"backbone.overview": "0.0.2", "backbone.overview": "0.0.2",
"otr": "0.2.12", "otr": "0.2.16",
"crypto-js-evanvosberg": "https://github.com/evanvosberg/crypto-js.git#release-3.1.2-5", "crypto-js-evanvosberg": "https://github.com/evanvosberg/crypto-js.git#release-3.1.2-5",
"almond": "~0.3.0", "almond": "~0.3.1",
"requirejs-text": "~2.0.12", "requirejs-text": "~2.0.14",
"requirejs-tpl-jcbrand": "*", "requirejs-tpl-jcbrand": "*",
"momentjs": "~2.10.6", "momentjs": "~2.12.0",
"jquery.browser": ">=0.0.7", "jquery.browser": ">=0.1.0",
"bootstrap": "~3.2.0", "bootstrap": "~3.2.0",
"fontawesome": "~4.1.0", "fontawesome": "~4.1.0",
"typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js", "typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js",
"strophejs": "1.2.4", "strophejs": "1.2.5",
"strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#amd", "strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#amd",
"bourbon": "~4.2.3" "bourbon": "~4.2.6"
}, },
"resolutions": { "resolutions": {
"backbone": "1.1.2" "backbone": "1.1.2",
"requirejs": "~2.2.0",
"jquery": "1.12.2"
}, },
"exportsOverride": {}, "exportsOverride": {},
"ignore": [ "ignore": [
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment