Merging from upstream repo

This commit is contained in:
Jacob Gable 2013-05-13 14:19:28 -05:00
commit c49dc73385
3 changed files with 13 additions and 5 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "content/themes/casper"]
path = content/themes/casper
url = git@github.com:TryGhost/Casper.git
url = git://github.com/TryGhost/Casper.git

7
.travis.yml Normal file
View File

@ -0,0 +1,7 @@
language: node_js
node_js:
- "0.11"
- "0.10"
- "0.8"
git:
submodules: false

View File

@ -3,26 +3,27 @@
"version": "0.0.1",
"private": true,
"scripts": {
"start": "node app"
"start": "node app",
"test": "nodeunit core/test/ghost"
},
"dependencies": {
"express": "3.1.0",
"express-hbs": "*",
"connect-flash": "*",
"node-polyglot": "0.2.1",
"css": "*",
"moment": "*",
"underscore": "*",
"showdown": "*",
"node-polyglot": "*",
"sqlite3": "2.1.7",
"jugglingdb": "0.2.x",
"jugglingdb-sqlite3": "git+https://github.com/jugglingdb/sqlite3-adapter.git#master"
},
"devDependencies": {
"nodeunit": "*",
"grunt": "~0.4.1",
"grunt-contrib-nodeunit": "~0.1.2",
"grunt-jshint2": "~0.1.1",
"grunt-contrib-compass": "~0.2.0"
"grunt-contrib-compass": "~0.2.0",
"nodeunit": "*"
}
}