Skip to content

Commit

Permalink
Merge pull request bitpay#396 from colkito/bug/new-dependencies-schema
Browse files Browse the repository at this point in the history
added compiled files. postinstall script removed from package.json
  • Loading branch information
matiu committed Feb 24, 2014
2 parents f603657 + d2d3f95 commit a4ec3c0
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 18 deletions.
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ db/blocks
db/testnet/blocks/*
db/testnet/blocks

public/js/*
public/css/*
public/js/angularjs-all.js
public/js/main.js
public/js/vendors.js

public/css/main.css

README.html
26 changes: 10 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@
"node": "*"
},
"scripts": {
"start": "node node_modules/grunt-cli/bin/grunt",
"postinstall": "node node_modules/bower/bin/bower install; node ./node_modules/grunt-cli/bin/grunt compile "
"start": "node node_modules/grunt-cli/bin/grunt"
},
"dependencies": {
"base58-native": "0.1.2",
Expand All @@ -62,16 +61,7 @@
"express": "~3.4.7",
"jade": "~1.0.2",
"lodash": "~2.4.1",
"bower": "~1.2.8",
"buffertools": "*",
"grunt": "~0.4.2",
"grunt-cli": "~0.1.11",
"grunt-env": "~0.4.1",
"grunt-contrib-jshint": "~0.8.0",
"grunt-contrib-watch": "~0.5.3",
"grunt-concurrent": "~0.4.2",
"grunt-nodemon": "~0.1.2",
"grunt-mocha-test": "~0.8.1",
"should": "~2.1.1",
"view-helpers": "latest",
"socket.io": "~0.9.16",
Expand All @@ -83,13 +73,17 @@
"xmlhttprequest": "~1.6.0"
},
"devDependencies": {
"grunt-contrib-watch": "latest",
"grunt-contrib-jshint": "latest",
"bower": "~1.2.8",
"grunt": "~0.4.2",
"grunt-cli": "~0.1.11",
"grunt-env": "~0.4.1",
"grunt-contrib-jshint": "~0.8.0",
"grunt-contrib-watch": "~0.5.3",
"grunt-concurrent": "~0.4.2",
"grunt-nodemon": "~0.2.0",
"grunt-mocha-test": "~0.8.1",
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-uglify": "~0.3.2",
"grunt-nodemon": "latest",
"grunt-concurrent": "latest",
"grunt-mocha-test": "latest",
"should": "latest",
"grunt-css": "~0.5.4",
"grunt-markdown": "~0.5.0"
Expand Down
1 change: 1 addition & 0 deletions public/css/main.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions public/js/angularjs-all.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit a4ec3c0

Please sign in to comment.