diff --git a/.travis.yml b/.travis.yml index e39db108..f7fe2b60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ env: - TEST_SUITE=integration BROWSER='internet explorer:9' - TEST_SUITE=integration BROWSER='internet explorer:10' - TEST_SUITE=integration BROWSER='internet explorer:11' - #- TEST_SUITE=integration BROWSER='opera:11' - #- TEST_SUITE=integration BROWSER='opera:12' + - TEST_SUITE=integration BROWSER='opera:11' + - TEST_SUITE=integration BROWSER='opera:12' - TEST_SUITE=integration BROWSER='chrome' global: - secure: VY4J2ERfrMEin++f4+UDDtTMWLuE3jaYAVchRxfO2c6PQUYgR+SW4SMekz855U/BuptMtiVMR2UUoNGMgOSKIFkIXpPfHhx47G5a541v0WNjXfQ2qzivXAWaXNK3l3C58z4dKxgPWsFY9JtMVCddJd2vQieAILto8D8G09p7bpo= @@ -24,8 +24,7 @@ node_js: before_script: - npm install -g grunt-cli@0.1.13 - npm install -g node-static@0.7.3 -# until https://github.com/bower/bower/pull/1403 is merged -- npm install -g git://github.com/jharding/bower.git +- npm install -g bower@1.3.8 - bower install - grunt build script: test/ci diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ede6896..62109dab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ For more information on semantic versioning, please visit http://semver.org/. --- +### 0.10.5 August 7, 2014 + +* Increase supported version range for jQuery dependency. [#917] + ### 0.10.4 July 13, 2014 **Hotfix** @@ -155,6 +159,7 @@ work for them with a custom implementation. [0.10.0 milestone]: https://github.com/twitter/typeahead.js/issues?milestone=8&page=1&state=closed +[#917]: https://github.com/twitter/typeahead.js/pull/917 [#899]: https://github.com/twitter/typeahead.js/pull/899 [#881]: https://github.com/twitter/typeahead.js/pull/881 [#839]: https://github.com/twitter/typeahead.js/pull/839 diff --git a/bower.json b/bower.json index 825bf03e..056c82ac 100644 --- a/bower.json +++ b/bower.json @@ -3,10 +3,11 @@ "version": "0.10.4", "main": "dist/typeahead.bundle.js", "dependencies": { - "jquery": "~1.7" + "jquery": ">=1.7" }, "devDependencies": { + "jquery": "~1.7", "jasmine-ajax": "~1.3.1", "jasmine-jquery": "~1.5.2" } -} \ No newline at end of file +}