From 9ddfc8d6867b4a0fa2c3d82582664fb5e70b9793 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Mon, 14 Sep 2015 22:06:15 -0700 Subject: Set logo width to 100% --- public/css/calculator.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/calculator.less b/public/css/calculator.less index 72e98976..bf2de93e 100644 --- a/public/css/calculator.less +++ b/public/css/calculator.less @@ -40,7 +40,7 @@ div#calculator { p#address { padding-top: 10px; } #title { display: none; } #title a { color: #000; text-decoration: none; } - #logo { display: none; padding: 10px 0; margin-bottom: 10px; max-height: 250px; } + #logo { display: none; padding: 10px 0; margin-bottom: 10px; max-height: 250px; width: 100%; } #error { margin-top: 10px; } } -- cgit v1.2.3 From a8e9e03f464ca0d79c5e75ea56dd34fdfdd1b595 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 16 Sep 2015 20:46:36 -0700 Subject: Don't detect static asset changes --- app.js | 3 ++- src/app.coffee | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index 8fd499d2..c82f895e 100644 --- a/app.js +++ b/app.js @@ -146,7 +146,8 @@ app.get('/:user', cache, users.show); app.use(require('connect-assets')({ - src: 'public' + src: 'public', + detectChanges: false })); app.use(function(err, req, res, next) { diff --git a/src/app.coffee b/src/app.coffee index 1ea1d2cf..3208ae49 100644 --- a/src/app.coffee +++ b/src/app.coffee @@ -89,7 +89,7 @@ app.get('/:user/report', authorize, transactions.index) app.get('/:user.json', users.json) app.get('/:user', cache, users.show) -app.use(require('connect-assets')(src: 'public')) +app.use(require('connect-assets')(src: 'public', detectChanges: false)) app.use((err, req, res, next) -> res.status(500) -- cgit v1.2.3 From 8e87409f6deb2dddfa071976448e602527558757 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 15 Oct 2015 22:44:40 -0700 Subject: Make QR code smaller --- public/js/calculator.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/calculator.coffee b/public/js/calculator.coffee index d173403c..cc2dcece 100644 --- a/public/js/calculator.coffee +++ b/public/js/calculator.coffee @@ -105,7 +105,7 @@ updateTotal = -> $('#total').html(total.toString()) $('#qr').html('') - new QRCode('qr', text: "bitcoin:#{g.user.address}?amount=#{g.amount_requested.toString()}", width: 320, height: 320) + new QRCode('qr', text: "bitcoin:#{g.user.address}?amount=#{g.amount_requested.toString()}", width: 280, height: 280) listen = -> setTimeout(listen, 10000) -- cgit v1.2.3 From dd304a2cc7675b09d1db93f2835c4603474c8581 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 13 Nov 2015 14:05:15 -0800 Subject: Use bcryptjs instead of bcrypt --- install.js | 2 +- passport.js | 2 +- routes/users.js | 2 +- src/passport.coffee | 2 +- src/routes/users.coffee | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install.js b/install.js index 088d593e..30ece122 100644 --- a/install.js +++ b/install.js @@ -3,7 +3,7 @@ db = require("./redis"); - bcrypt = require('bcrypt'); + bcrypt = require('bcryptjs'); db.get("user:admin", function(err, res) { if (!res) { diff --git a/passport.js b/passport.js index aa11d658..b8b266d1 100644 --- a/passport.js +++ b/passport.js @@ -3,7 +3,7 @@ db = require("redis").createClient(); - bcrypt = require('bcrypt'); + bcrypt = require('bcryptjs'); passport = require('passport'); diff --git a/routes/users.js b/routes/users.js index 36914152..4ef67d2c 100644 --- a/routes/users.js +++ b/routes/users.js @@ -5,7 +5,7 @@ config = require("../config"); - bcrypt = require('bcrypt'); + bcrypt = require('bcryptjs'); fs = require('fs'); diff --git a/src/passport.coffee b/src/passport.coffee index 12913424..aba6ff53 100644 --- a/src/passport.coffee +++ b/src/passport.coffee @@ -1,5 +1,5 @@ db = require("redis").createClient() -bcrypt = require('bcrypt') +bcrypt = require('bcryptjs') passport = require('passport') LocalStrategy = require('passport-local').Strategy diff --git a/src/routes/users.coffee b/src/routes/users.coffee index 014b74b3..5daae180 100644 --- a/src/routes/users.coffee +++ b/src/routes/users.coffee @@ -1,6 +1,6 @@ db = require("../redis") config = require("../config") -bcrypt = require('bcrypt') +bcrypt = require('bcryptjs') fs = require('fs') request = require('request') -- cgit v1.2.3 From 6f9410cc9ae98c3838cac3a7682acf6269ca7a6d Mon Sep 17 00:00:00 2001 From: Alex Millar Date: Fri, 13 Nov 2015 14:29:04 -0800 Subject: Added a contributors section --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e92b2228..e2289f1e 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,10 @@ Download and configure CoinOS: Now the app should be runnning at http://localhost:3000/ +# Contributors + + Contributors include: Alex Millar + # License Copyright (C) 2012 Adam Soltys -- cgit v1.2.3