Merge branch 'master' of github.com:typpo/textbelt
This commit is contained in:
		
							
								
								
									
										8
									
								
								app.js
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								app.js
									
									
									
									
									
								
							@@ -1,5 +1,5 @@
 | 
				
			|||||||
var express = require('express')
 | 
					var express = require('express')
 | 
				
			||||||
  , app = express.createServer()
 | 
					  , app = express()
 | 
				
			||||||
  , _ = require('underscore')
 | 
					  , _ = require('underscore')
 | 
				
			||||||
  , fs = require('fs')
 | 
					  , fs = require('fs')
 | 
				
			||||||
  , mixpanel = require('mixpanel')
 | 
					  , mixpanel = require('mixpanel')
 | 
				
			||||||
@@ -10,11 +10,7 @@ var express = require('express')
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
var mpq = new mixpanel.Client('6e6e6b71ed5ada4504c52d915388d73d');
 | 
					var mpq = new mixpanel.Client('6e6e6b71ed5ada4504c52d915388d73d');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var redis;
 | 
					var redis = require('redis-url').connect();
 | 
				
			||||||
if (process.env.NODE_ENV == 'production')
 | 
					 | 
				
			||||||
  redis = require('redis-url').connect(process.env.REDISTOGO_URL);
 | 
					 | 
				
			||||||
else
 | 
					 | 
				
			||||||
  redis = require('redis-url').connect();
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Express config
 | 
					// Express config
 | 
				
			||||||
app.set('views', __dirname + '/views');
 | 
					app.set('views', __dirname + '/views');
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    "name": "TextBelt"
 | 
					    "name": "TextBelt"
 | 
				
			||||||
  , "dependencies": {
 | 
					  , "dependencies": {
 | 
				
			||||||
      "express": "2.5.2"
 | 
					      "express": "latest"
 | 
				
			||||||
      , "jade": "0.14.2"
 | 
					      , "jade": "0.14.2"
 | 
				
			||||||
      , "nodemailer": "latest"
 | 
					      , "nodemailer": "latest"
 | 
				
			||||||
      , "redis-url": "latest"
 | 
					      , "redis-url": "latest"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user