summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-02-02 13:24:07 -0500
committerJules Laplace <jules@okfoc.us>2015-02-02 13:24:07 -0500
commitbfec3dacc5c7dccf42b29569f4c29b168f36f8fe (patch)
tree001f26d9d762591a01fd9c4f80520696f0c3e370
parent466e56bbdcf1b713a91e77081237b3adf0b86ba0 (diff)
parent03842d65cc018f9a718b2408d19e978f3d08e042 (diff)
Merge branch 'subscriptions' of github.com:okfocus/vvalls into subscriptions
-rw-r--r--server/lib/views/index.js2
-rw-r--r--server/lib/webhook/index.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 9f244c8..be46cc6 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -107,7 +107,7 @@ var views = module.exports = {
partials: {
plans: function (req, res){
views_middleware.ensurePlans(req, res, function(){
- res.render('about/_plans')
+ res.render('about/_plans', { logged_in: res.locals.logged_in || false })
})
},
},
diff --git a/server/lib/webhook/index.js b/server/lib/webhook/index.js
index eb6a6b3..a5f23ac 100644
--- a/server/lib/webhook/index.js
+++ b/server/lib/webhook/index.js
@@ -37,7 +37,7 @@ site.ready = function(){
console.log('Webhook server listening on port ' + app.get('port'));
});
- app.get('/', function(req,res){ res.send('HI THERE') })
+ app.get('/', function(req,res){ res.send('hello@vvalls.com') })
webhook.route(app)
}