Commit Graph

55 Commits

Author SHA1 Message Date
Sam Dodrill 18da907d36 Update Dockerfile again 2015-01-09 17:57:44 -08:00
Sam Dodrill 7b4e12dd93 We don't need debug output 2015-01-09 17:44:53 -08:00
Sam Dodrill 9e709d69be Try 2 2015-01-09 17:41:27 -08:00
Sam Dodrill 919d7c7c70 mend procfile 2015-01-09 17:40:08 -08:00
Sam Dodrill 789aa0776a config: remove double-set 2015-01-09 17:37:33 -08:00
Sam Dodrill dcc07dda42 rockspec: reorder things 2015-01-09 17:35:36 -08:00
Sam Dodrill e368fcc2e4 Add rockspec 2015-01-09 17:31:41 -08:00
Sam Dodrill c9c189aacc fix .env file 2015-01-09 17:29:38 -08:00
Sam Dodrill b7835dab18 Use buildpack 2015-01-09 17:29:23 -08:00
Sam Dodrill d67c38e4fe Revert "Remove .env file"
This reverts commit dba53349a2.
2015-01-09 17:28:34 -08:00
Sam Dodrill 94f0e028c7 Fix config 2015-01-09 17:19:20 -08:00
Sam Dodrill dba53349a2 Remove .env file 2015-01-09 17:16:04 -08:00
Sam Dodrill c31ed4e863 fix logging logic 2015-01-09 17:12:25 -08:00
Sam Dodrill 78bdf6eb02 log database config 2015-01-09 17:10:41 -08:00
Sam Dodrill 01183ab1bc make dokku config more reliable 2015-01-09 17:02:49 -08:00
Sam Dodrill 7cbaa1915f Merge branch 'master' of git.xeserv.us:userman/panel 2015-01-09 16:53:21 -08:00
Sam Dodrill 7444107f6c Update config 2015-01-09 16:53:18 -08:00
Sam Dodrill 0a366eb677 Add exposed port to dockerfile 2015-01-09 16:41:23 -08:00
Sam Dodrill ae9b2a7c50 update for my lapis dockerfile 2015-01-08 19:42:23 -08:00
Sam Dodrill e5271a0f43 Update rockspec 2015-01-08 19:25:36 -08:00
Sam Dodrill 3e36badf12 add lua variables to environment 2015-01-08 19:03:37 -08:00
Sam Dodrill a277a1fda4 update stack variable 2015-01-08 18:59:55 -08:00
Sam Dodrill 7ab3d66b19 use debugging buildpack 2015-01-08 18:53:58 -08:00
Sam Dodrill ab6cad7863 directly run moonscript 2015-01-08 18:49:41 -08:00
Sam Dodrill f34dd86b6c fix dokku support 2015-01-08 18:48:01 -08:00
Sam Dodrill 36c415b160 Add dokku stuff for config 2015-01-08 18:44:33 -08:00
Sam Dodrill b5984b43ec Use flashes 2015-01-08 17:51:20 -08:00
Sam Dodrill 05aaa39e17 use a bootstrap style 2015-01-08 13:55:49 -08:00
Sam Dodrill 9623946701 models/user: add name to session 2015-01-08 13:54:41 -08:00
Sam Dodrill 6594600a03 Simplify a big part of the logic 2015-01-08 13:22:26 -08:00
Sam Dodrill ff4eee25bc Use a before_filter to simplify controller logic 2015-01-08 13:21:26 -08:00
Sam Dodrill e26f23e0a0 dockerignore: don't add git files to docker image 2015-01-07 21:14:04 -08:00
Sam Dodrill 15c50ec516 views/register: simplify HTML generation 2015-01-07 21:04:41 -08:00
Sam Dodrill 020e9e7712 controller/users: add logout route 2015-01-07 20:59:15 -08:00
Sam Dodrill 70c130d978 controllers/freeswitch: reorder the failure logic for no such user 2015-01-07 16:44:55 -08:00
Sam Dodrill 2b05ef2c96 views/freeswitch: delete tokens after they are used 2015-01-07 14:46:23 -08:00
Sam Dodrill d9eb308dd6 controller/users: update user correctly 2015-01-07 14:42:34 -08:00
Sam Dodrill 0bdc0a6e3d Use token model for freeswitch 2015-01-07 14:35:38 -08:00
Sam Dodrill 521dd08c70 Add token model 2015-01-07 14:35:14 -08:00
Sam Dodrill 3b91237dd6 app: simplify main app 2015-01-07 13:26:35 -08:00
Sam Dodrill c992d1b080 Move freeswitch logic into its own controller 2015-01-07 13:25:38 -08:00
Sam Dodrill 7c71009a46 move user stuff into a controller 2015-01-07 13:21:05 -08:00
Sam Dodrill 93e5a8f341 app: freeswitch queries extension 2015-01-07 10:36:20 -08:00
Sam Dodrill af83d44a29 app: make the extension the user's ID + 1000 2015-01-07 09:57:48 -08:00
Sam Dodrill b03bd4b7c4 app: add page titles 2015-01-07 09:10:16 -08:00
Sam Dodrill 36de093dd7 models/user: write sip password to session 2015-01-07 09:10:04 -08:00
Sam Dodrill 2d9a63fa4a views/index: show debug information better 2015-01-07 09:09:25 -08:00
Sam Dodrill 3908042abd Add freeswitch integration 2015-01-07 08:42:49 -08:00
Sam Dodrill 3abce75db4 migrations: add is_agent field 2015-01-05 19:26:18 -08:00
Sam Dodrill fe27710421 test session data 2015-01-05 19:09:03 -08:00