Commit graph

12 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
benji
78863c40b7 Merge branch 'master' into filter-datatables 2015-09-10 21:49:08 +02:00
Ilion Beyst
dd3c27c374 make datatable an object 2015-09-10 20:12:12 +02:00
Felix Van der Jeugt
2c1c92edb3 show all transactions on index, show user transactions on user show 2015-09-10 16:51:23 +02:00
Felix Van der Jeugt
079c1ea4d0 Merge branch 'master' into datagrid 2015-09-10 16:18:46 +02:00
benji
f5d3a58bbb Move inline form to users#show 2015-09-10 14:12:05 +02:00
Felix Van der Jeugt
b4695d623f replace datatables for user with datagrid for transactions 2015-09-10 00:35:59 +02:00
Felix Van der Jeugt
028f52ecde write own datatables backend - no filtering 2015-09-09 14:46:06 +02:00
Ilion Beyst
eb717e8cbd Move transaction table to user/show 2015-09-08 20:45:32 +02:00
benji
2f07856b67 Add authorization to user controller 2015-09-08 17:40:40 +02:00
benji
380bce6ed6 Add index and show action for users 2015-09-08 17:28:46 +02:00
Ilion Beyst
92ea144116 Add user controller and views 2015-09-08 15:14:46 +02:00