Commit graph

26 commits

Author SHA1 Message Date
Ilion Beyst
a3a7ff8c44 Revert "Merge branch 'master' into filter-datatables"
This reverts commit 78863c40b7, reversing
changes made to bbaa070cca.
2015-09-10 22:25:52 +02:00
Felix Van der Jeugt
7bb2502b6f Merge branch 'master' into datagrid 2015-09-10 14:56:51 +02:00
benji
4c44b3f738 Rspec tests 2015-09-09 20:11:59 +02:00
Felix Van der Jeugt
7eb32bf1c3 Merge branch 'master' into filter-datatables 2015-09-09 18:17:55 +02:00
Ilion Beyst
21e6432b41 fix ability when not logged in 2015-09-09 16:56:55 +02:00
Ilion Beyst
3a0d5f1017 add cancancan ability for creating transactions 2015-09-09 16:51:41 +02:00
Felix Van der Jeugt
028f52ecde write own datatables backend - no filtering 2015-09-09 14:46:06 +02:00
benji
c3bf2b74cc Merge branch 'api' of https://github.com/ZeusWPI/Tab into api 2015-09-09 12:59:12 +02:00
benji
6229556e38 Make create in transactions work 2015-09-09 12:58:44 +02:00
Ilion Beyst
95f4c54780 re-annotate 2015-09-09 12:50:39 +02:00
Ilion Beyst
87c2994cf0 add issuer to transaction 2015-09-09 12:49:24 +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
1233431d14 Added Zeus user 2015-09-08 21:38:29 +02:00
benji
31d5d81c9b Add ability of cancancan 2015-09-08 17:18:38 +02:00
benji
599570f033 Add validations 2015-09-08 15:51:23 +02:00
Ilion Beyst
f430aa7b12 Generate client keys 2015-09-08 14:26:04 +02:00
benji
c38f363dd6 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-08 13:36:16 +02:00
benji
4dc8c36eee Add omniauth strategie for zeuswpi 2015-09-08 13:34:29 +02:00
Ilion Beyst
246492c546 Cache balance in user 2015-09-08 13:09:34 +02:00
Ilion Beyst
334054142c add transactions method to user 2015-09-08 12:45:11 +02:00
Ilion Beyst
29a9af3cf0 Added associations 2015-09-08 12:11:48 +02:00
Ilion Beyst
dcae5f8784 Annotate models 2015-09-08 11:44:40 +02:00
Ilion Beyst
cb05d1d742 fix migrations and create database 2015-09-08 11:44:07 +02:00
Ilion Beyst
f96ddba717 generate models 2015-09-08 11:30:28 +02:00
benji
ee79fdcb26 Initial rails project 2015-09-07 11:44:48 +02:00