Commit graph

99 commits

Author SHA1 Message Date
benji 62075f9cb1 Remove redirect loop for koelkast 2015-10-27 16:31:10 +01:00
benji 8099de435b Fix 69 2015-10-26 18:57:59 +01:00
benji 3fc7f9f884 Remove delayedjob info from log 2015-10-07 16:20:58 +02:00
benji 328f806d39 Change token login to get 2015-10-07 15:06:01 +02:00
benji e6264fd6c8 Move some stuff to barcodecontroller where it belongs + refactoring 2015-09-28 21:51:40 +02:00
benji 19dec68c59 add workflow for adding products/stock through barcodes 2015-09-25 14:24:32 +02:00
benji 0885359d71 users controller test 2015-09-22 20:06:50 +02:00
benji 71659e246d Change koelkast login to login with token 2015-09-22 07:13:35 +02:00
benji 046b2c382c Merge branch 'master' into barcode 2015-09-21 19:07:03 +02:00
benji 6403835872 Use barcode to create new order 2015-09-20 21:21:18 +02:00
benji 17a54723ec Remove index and destroy on userscontroller 2015-09-18 21:05:32 +02:00
benji c36fe9453a Change call_api_after back 2015-09-18 17:16:41 +02:00
benji d3f32a89aa change uid to name in devise initializers 2015-09-18 14:21:13 +02:00
benji 76f8332e97 Remove some gems 2015-09-18 13:20:57 +02:00
benji 5e666d8cb8 Fix failing tests 2015-09-14 20:55:49 +02:00
benji b55ba47209 Refactor 2015-09-14 20:26:16 +02:00
benji 251d3b69b7 Move tab api to seperate job 2015-09-14 17:29:00 +02:00
benji 02b27233cd Save transaction id 2015-09-14 11:20:52 +02:00
benji 891e596fda replace tab api key to secrets 2015-09-12 11:47:00 +02:00
benji 052989e819 Remove bin from linked dirs 2015-09-12 11:33:54 +02:00
benji 5ba36e431f Merge branch 'rspec' 2015-09-12 11:30:59 +02:00
benji 48aaaa354d Merge branch 'master' into rspec 2015-09-12 11:30:09 +02:00
benji fc5fa70980 Add capistrano support for delayed job 2015-09-12 11:27:33 +02:00
benji 825dee8e02 Add delayed job to post requests to tab 2015-09-12 11:17:58 +02:00
Tom Naessens 957fc54d1a Forgot a sub 2015-09-08 13:34:36 +02:00
Tom Naessens 81691282f8 Merge branch 'master' of github.com:ZeusWPI/Tap 2015-09-08 13:30:24 +02:00
Tom Naessens 8ac363911e s/tab/tap/g 2015-09-08 13:30:18 +02:00
benji 28774b3175 Add tests for user controller 2015-09-07 21:15:16 +02:00
benji 3c4ada0704 Remove slack support from Tap 2015-09-04 14:14:49 +02:00
Tom Naessens 060d4b6a0c Fix asset pipeline stuff 2015-09-02 14:05:25 +02:00
benji 0862b275fc Create actionmodel stock/stockentry and change form 2015-09-01 23:13:20 +02:00
benji b7c292275b Remove schulden for admins as this has been moved to a seperate application 2015-09-01 18:15:27 +02:00
Tom Naessens ea2731f63f Fix tap repos 2015-09-01 15:40:16 +02:00
Tom Naessens 8fdaf44115 Fix deployment 2015-09-01 15:05:56 +02:00
Tom Naessens d8c6ec8f0b Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-01 15:02:21 +02:00
Tom Naessens 4763433b48 Prepare tab for new server 2015-09-01 15:02:14 +02:00
benji b5017bff9a Remove debt from tab and refactor some code 2015-08-31 14:33:15 +02:00
benji 8e5ccfed7a urgh 2015-04-04 02:50:26 +02:00
benji 48236e1f69 add token for tests 2015-04-04 02:09:25 +02:00
benji d8f77442ab comma and empty token in development 2015-04-04 01:51:11 +02:00
benji 0105c30a36 secrets 2015-04-04 01:47:02 +02:00
benji be9c967db2 Add slack notification 2015-04-04 01:44:28 +02:00
benji e4e717084b put back database_authenticatable to users, fix empty avatar form bug 2015-03-25 17:49:37 +01:00
benji 63e9b81754 remove ssl skip - we're secure now 2015-03-25 09:11:40 +01:00
benji efd4dcbb2c Replace multistep registration by default avatar from identicon 2015-03-23 11:54:15 +01:00
benji 33ffcfdb9b remove database_authenticatable from user and fix paths 2015-03-21 17:58:49 +01:00
benji 6cbf3df70e No root path when session present 2015-03-20 04:54:44 +01:00
benji 3ecb2b53d8 Add user avatar after user creation 2015-03-20 03:57:00 +01:00
benji 6ca2ecebc2 Change devise to handle oauth 2015-03-20 02:21:56 +01:00
benji d6a41c8823 devise secret key 2015-03-19 23:33:59 +01:00