rewrite2 some fixes so deploy plays nicely with heroku

This commit is contained in:
Tyler Renelle 2013-08-27 00:52:49 -04:00
parent bc57d070f7
commit 893febf4d8
2 changed files with 9 additions and 5 deletions

View file

@ -15,12 +15,11 @@
],
"dependencies": {
"jquery": "~2.0.3",
"bootstrap": "v2.3.2",
"angular": "1.2.0-rc.1",
"angular-resource": "1.2.0-rc.1",
"angular-ui": "~0.4.0",
"angular-bootstrap": "~0.5.0",
"habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#master",
"habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#rewrite",
"lodash": "~1.3.1",
"moment": "~2.1.0",
"bootstrap-tour": "~0.5.1",
@ -30,6 +29,11 @@
"bootstrap-growl": "~1.1.0",
"jquery.cookie": "~1.3.1",
"sticky": "*",
"bootstrap-datepicker": "~1.2.0"
"bootstrap-datepicker": "~1.2.0",
"bootstrap": "v2.3.2"
},
"resolutions": {
"jquery": "~2.0.3",
"bootstrap": "v2.3.2"
}
}

View file

@ -1,7 +1,7 @@
{
"name": "habitrpg",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "0.0.0-151",
"version": "0.0.0-152",
"main": "./server.js",
"dependencies": {
"habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared#rewrite",
@ -43,6 +43,6 @@
"scripts": {
"start": "nodemon src/server.coffee",
"test": "mocha test/api.mocha.coffee",
"postinstall": "./node_modules/bower/bin/bower install"
"postinstall": "./node_modules/bower/bin/bower install -f"
}
}