961 Commits

Author SHA1 Message Date
David Baldwynn
bb33d9c4e5
fixed DISABLE_CLUSTER_MODE 2017-03-30 12:44:54 -07:00
David Baldwynn
ef6ccaee99
fixed socket.io 2017-03-30 12:39:50 -07:00
David Baldwynn
11c7890f3c
fixed merge error 2017-03-30 12:33:58 -07:00
David Baldwynn
b964504336 Update app.json 2017-03-30 12:27:07 -07:00
David Baldwynn
e9fb0052d4
Merge branch 'stage' 2017-03-30 12:02:01 -07:00
David Baldwynn
bf408586e5
Merge branch 'master' of https://github.com/whitef0x0/tellform into stage 2017-03-30 12:01:39 -07:00
David Baldwynn
ddaf39c660 Fixed mongolab env variables 2017-03-30 12:00:54 -07:00
David Baldwynn
c08daea2cc Fixed json formatting errors 2017-03-30 11:57:09 -07:00
David Baldwynn
7543d12163 Update app.json 2017-03-30 11:56:12 -07:00
David Baldwynn
610033ff32 Update app.json 2017-03-30 11:56:01 -07:00
David Baldwynn
f98725658b Added env variables and addons 2017-03-30 11:55:51 -07:00
David Baldwynn
6de287b9d3 Added socketPort env variable 2017-03-30 11:54:59 -07:00
David Baldwynn
9fdd8fbd5d Update socket.io.js 2017-03-30 11:50:23 -07:00
David Baldwynn
14857175de Update production.js 2017-03-30 11:49:24 -07:00
David Baldwynn
9b8b7ff4a2
Merge branch 'master' of https://github.com/whitef0x0/tellform into stage 2017-03-30 11:45:05 -07:00
David Baldwynn
531e68ebb5 Removed grunt build script 2017-03-30 11:32:15 -07:00
David Baldwynn
86e8fff8ef Remove admin credentials from app.json 2017-03-30 11:24:08 -07:00
David Baldwynn
e893521363 Update app.json 2017-03-30 11:23:32 -07:00
David Baldwynn
c5a629240e
Merge branch 'master' of https://github.com/whitef0x0/tellform into stage 2017-03-30 11:19:35 -07:00
David Baldwynn
68f3c64ccb Fixed postdeploy script name. 2017-03-30 11:13:06 -07:00
David Baldwynn
d596ad5051 Update app.json 2017-03-30 11:07:58 -07:00
David Baldwynn
218eb65e1f Readded BASE_URL to app.json 2017-03-30 11:02:53 -07:00
David Baldwynn
6b34143826 Update app.json 2017-03-30 11:01:50 -07:00
David Baldwynn
0c551b5719 Fixed app.json error 2017-03-30 11:01:24 -07:00
David Baldwynn
b3131dfaac Fixed json error in app.json 2017-03-30 11:00:07 -07:00
David Baldwynn
9891187c7b Fixed addon not found 2017-03-30 10:59:49 -07:00
David Baldwynn
47c929467a Added HEROKU_APP_NAME env to baseUrl config parameter 2017-03-30 10:56:37 -07:00
David Baldwynn
e407cf25fa Added dyno-metadata addon 2017-03-30 10:55:19 -07:00
David Baldwynn
5317edabfd Moved create-admin script to post deploy 2017-03-30 10:53:03 -07:00
David Baldwynn
c0ef89b19b Fixed json schema 2017-03-30 10:47:25 -07:00
David Baldwynn
138ad4eac8 Update 2017-03-30 10:45:13 -07:00
David Baldwynn
a36066d710 Fixed app.json template errors 2017-03-30 10:44:11 -07:00
David Baldwynn
1a4e445f4a Update create_admin.js 2017-03-30 10:43:06 -07:00
David Baldwynn
7dbccb9bd5 Added create admin script to app.json 2017-03-30 10:42:26 -07:00
David Baldwynn
18bb453c50 Updated mongolab env variables 2017-03-30 10:37:45 -07:00
David Baldwynn
50379fa866 Added heroku admin creation script 2017-03-30 10:36:30 -07:00
David Baldwynn
5279016eff Fixed MAILER_SERVICE_PROVIDER default value 2017-03-30 10:31:15 -07:00
David Baldwynn
ca6fc064ce Added SparkPost sandbox domain 2017-03-30 10:29:04 -07:00
David Baldwynn
2651d1a7b8 Added SparkPost addon env variables for heroku installation 2017-03-30 10:25:20 -07:00
David Baldwynn
4169e18e73 Update app.json 2017-03-30 10:24:23 -07:00
David Baldwynn
5fcffd5ea8 Fixed redis heroku installation bug 2017-03-30 10:21:08 -07:00
David Baldwynn
bccb9621c8 Added IS_HEROKU_INSTALLATION env to app.json 2017-03-30 10:14:52 -07:00
David Baldwynn
43e277181b Disabled redis if it is a heroku installation 2017-03-30 10:13:38 -07:00
David Baldwynn
f1c43f152a Fixed bower resolutions 2017-03-30 10:11:18 -07:00
David Baldwynn
d76f656238 Added multer to dependencies 2017-03-30 10:06:50 -07:00
David Baldwynn
408093125a Added mailer env variables 2017-03-30 10:05:08 -07:00
David Baldwynn
436d192ca5 Fixed mailer env for production config 2017-03-30 10:03:17 -07:00
David Baldwynn
ba69eb72c6 Added DISABLED_SUBDOMAINS to setup script 2017-03-30 10:01:06 -07:00
David Baldwynn
960f5a252b Added glob to main dependencies 2017-03-30 09:55:39 -07:00
David Baldwynn
05acf4819c Added BASE_URL env to app.json 2017-03-30 09:48:37 -07:00