Commit graph

79 commits

Author SHA1 Message Date
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
benji f81426d30d update environsments production 2015-03-19 23:18:18 +01:00
Tom Naessens d4c883e056 Add errbit to tab 2015-03-19 22:55:40 +01:00
Tom Naessens edef683f86 Merge branch 'master' of github.com:ZeusWPI/Tab 2015-03-19 22:53:53 +01:00
Tom Naessens c20aec9099 Add ruby version and king 2015-03-19 22:53:49 +01:00
benji eaa076b508 Add oauth 2015-03-19 22:37:16 +01:00
benji c9a24e81e2 Add tab omniauth 2015-03-19 19:03:17 +01:00
benji 191517bda7 Lot of styles, and some other stuff 2015-03-19 14:59:37 +01:00
benji ea93a4c456 Remove ugly constraint 2015-03-03 20:11:50 +01:00
benji f844625b55 Add first test - yeah 2015-03-03 15:56:23 +01:00
benji f37bc6acb0 rails 4.2 2015-02-10 09:00:29 +01:00
benji 7642e35d5d Add db/seeds and fix two minor bugs 2015-02-10 07:15:25 +01:00
benji cf8ec8da6e Some clean up 2015-02-09 17:06:24 +01:00
benji 39e96305b6 Add stock form 2015-02-08 10:11:23 +01:00
benji ca3045fbbf Add undo button for quickpay/dagschotel 2015-02-04 19:03:50 +01:00
benji 466b479ffd <3 relix 2015-01-09 13:12:19 +01:00
benji 7684f54120 Remove redirects for root and put logic in routes 2015-01-09 12:31:14 +01:00
benji f595b0dba9 Add controller action to define root based on user role 2015-01-06 20:33:11 +01:00
benji db23fd2181 Add koelkast to users 2015-01-06 20:18:01 +01:00
Benjamin Cousaert b0fec45150 cancancan permissions 2014-12-17 07:31:51 +01:00
Benjamin Cousaert cb94f2dbb8 Add schulden csv voor iepoev 2014-12-10 16:17:55 +01:00