Commit graph

126 commits

Author SHA1 Message Date
Ilion Beyst
b66a06f139 Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-09 12:53:28 +02:00
Ilion Beyst
95f4c54780 re-annotate 2015-09-09 12:50:39 +02:00
Ilion Beyst
dbc533a1cb mess around with api params 2015-09-09 11:56:13 +02:00
benji
a2ae293df0 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-09 11:54:59 +02:00
benji
738283dddd Change skip_authenticity_token by :null_session 2015-09-09 11:53:30 +02:00
Ilion Beyst
d32bfc55fb Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-09 11:32:40 +02:00
Ilion Beyst
7423cb4dda Add client identification methods 2015-09-09 11:31:34 +02:00
benji
f1af878c9e Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-09 11:25:01 +02:00
benji
321d0ea716 Add ClientAbility 2015-09-09 11:24:45 +02:00
Ilion Beyst
d48f5ffa2a Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-08 21:35:48 +02:00
benji
bb5a4019e6 Rewrite transaction controller 2015-09-08 21:07:00 +02:00
Ilion Beyst
eb717e8cbd Move transaction table to user/show 2015-09-08 20:45:32 +02:00
Felix Van der Jeugt
19a6f4b921 Merge branch 'master' into transaction-vc 2015-09-08 19:12:51 +02:00
Ilion Beyst
5d2eff242c Merge branch 'transaction-vc' of github.com:ZeusWPI/Tab into transaction-vc 2015-09-08 17:46:13 +02:00
Ilion Beyst
20bb280482 Make transaction datatable actually work 2015-09-08 17:46:07 +02:00
benji
2f07856b67 Add authorization to user controller 2015-09-08 17:40:40 +02:00
Felix Van der Jeugt
15ba18fa59 merge remote branch into transaction-vc 2015-09-08 17:32:03 +02:00
Ilion Beyst
c3c13f428a Fixed ajax datatable 2015-09-08 17:30:13 +02:00
Felix Van der Jeugt
363c825e55 add create controller and dummy view 2015-09-08 17:30:02 +02:00
benji
52808c27df Merge pull request #2 from ZeusWPI/cancancan
Add ability of cancancan
2015-09-08 17:29:15 +02:00
benji
380bce6ed6 Add index and show action for users 2015-09-08 17:28:46 +02:00
benji
31d5d81c9b Add ability of cancancan 2015-09-08 17:18:38 +02:00
Felix Van der Jeugt
993a54bd46 add transactions controller 2015-09-08 15:25:54 +02:00
Ilion Beyst
92ea144116 Add user controller and views 2015-09-08 15:14:46 +02:00
benji
4dc8c36eee Add omniauth strategie for zeuswpi 2015-09-08 13:34:29 +02:00
benji
ee79fdcb26 Initial rails project 2015-09-07 11:44:48 +02:00