Commit graph

81 commits

Author SHA1 Message Date
Ilion Beyst 39ee9a19a2 reverse transaction with negative amount 2015-09-11 16:35:46 +02:00
benji b67e0954e3 Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 15:50:10 +02:00
Ilion Beyst bd2c986604 order query on time 2015-09-11 15:51:15 +02:00
benji 3ec19abab3 diefstal is een misdrijf 2015-09-11 15:50:07 +02:00
Ilion Beyst dbaded000f return forbidden for forbidden json requests 2015-09-11 14:32:24 +02:00
Ilion Beyst 2ea8124a01 fix lower bound in number filter 2015-09-11 14:24:28 +02:00
benji 315687ffad Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 14:12:59 +02:00
benji ea14b6b472 typo 2015-09-11 14:12:54 +02:00
Ilion Beyst 9fea3a6ca4 format table values 2015-09-11 14:10:55 +02:00
benji 8d472c079b Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 13:17:07 +02:00
benji a2681f9951 Remote transaction form 2015-09-11 13:16:53 +02:00
Ilion Beyst 4fad3416c0 fix general retartedness on my side 2015-09-11 12:07:43 +02:00
Ilion Beyst bf9a845780 implement pagination 2015-09-11 12:07:43 +02:00
Felix Van der Jeugt d336e778f7 improve (and fix) parsing 2015-09-11 11:55:33 +02:00
benji dd7fc618b6 Make transaction form remote 2015-09-11 11:16:41 +02:00
Ilion Beyst fcb11bb036 fix :name in predicates 2015-09-11 10:46:03 +02:00
Ilion Beyst e621f6ef29 re-enable filters 2015-09-11 10:39:06 +02:00
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
Ilion Beyst c31a58cf89 select correct peer in datatable query 2015-09-10 22:15:43 +02:00
benji 78863c40b7 Merge branch 'master' into filter-datatables 2015-09-10 21:49:08 +02:00
benji c5dde90c43 Make transaction form remote 2015-09-10 21:46:05 +02:00
Ilion Beyst 86f8f30ab2 comment filters until input is fixed 2015-09-10 21:42:20 +02:00
Ilion Beyst 25c3bdd0ca implement filters for datatable 2015-09-10 21:09:57 +02:00
Ilion Beyst dd3c27c374 make datatable an object 2015-09-10 20:12:12 +02:00
Ilion Beyst fdf4e27a27 integrate arel query with datatable 2015-09-10 19:41:47 +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 ec5e556dde Prevent transaction amount with commas to give wrong results 2015-09-10 16:15:17 +02:00
benji 8da50eb32c current fix for x-api-key 2015-09-10 15:43:00 +02:00
benji d215b31739 Add euro symbol to amount field 2015-09-10 15:26:15 +02:00
Felix Van der Jeugt 7bb2502b6f Merge branch 'master' into datagrid 2015-09-10 14:56:51 +02:00
benji f5d3a58bbb Move inline form to users#show 2015-09-10 14:12:05 +02:00
Felix Van der Jeugt b2936f7645 chance scope to single user and show peers 2015-09-10 13:47:43 +02:00
Felix Van der Jeugt 9bde05abbb attempt to do this the long way once more 2015-09-10 12:09:30 +02:00
Felix Van der Jeugt 3a7472dcd0 add some columns to datagrid 2015-09-10 01:31:47 +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 8287b26d3f add filters for most columns, realise what mistake I made 2015-09-10 00:05:26 +02:00
Felix Van der Jeugt 5e4a5b727c add pagination 2015-09-09 22:22:50 +02:00
benji 5ff29d2a1f API test 2015-09-09 21:52:16 +02:00
Felix Van der Jeugt 1957e3854a parse ranges and return some data about the filtering 2015-09-09 21:09:19 +02:00
benji 4c44b3f738 Rspec tests 2015-09-09 20:11:59 +02:00
Felix Van der Jeugt c1d4b1c649 change table order 2015-09-09 20:06:42 +02:00
Felix Van der Jeugt 7eb32bf1c3 Merge branch 'master' into filter-datatables 2015-09-09 18:17:55 +02:00
Felix Van der Jeugt 747d014b85 write my own filtering form and parse with an object 2015-09-09 17:14:06 +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
Ilion Beyst 44e83e2aba allow euros and cents in transaction params 2015-09-09 16:26:06 +02:00
benji c20c30297b Install simple form 2015-09-09 14:59:13 +02:00
Felix Van der Jeugt 028f52ecde write own datatables backend - no filtering 2015-09-09 14:46:06 +02:00
benji 786e0a8d01 Merge branch 'api' of https://github.com/ZeusWPI/Tab into api 2015-09-09 14:08:42 +02:00