Commit graph

313 commits

Author SHA1 Message Date
benji
0cf7faa598 Add some css to datatables 2015-09-10 21:12:03 +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
Ilion Beyst
8ef41c9503 add helpers to transactions_query 2015-09-10 17:41:47 +02:00
Ilion Beyst
bd99e150a4 union all 2015-09-10 17:41:47 +02:00
Ilion Beyst
81b30902f7 add issuer name to transactions query 2015-09-10 17:41:47 +02:00
Ilion Beyst
2d753146f0 update transactions query to include peer 2015-09-10 17:41:47 +02:00
Ilion Beyst
65e6278b67 set baby steps in the transactions query 2015-09-10 17: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
benji
b30e1fb438 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-10 16:45:49 +02:00
benji
b55eb68118 Fix display correct amount in transaction form 2015-09-10 16:45:44 +02:00
Felix Van der Jeugt
61e6862154 fix more haml conversion errors 2015-09-10 16:34:11 +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
Ilion Beyst
d75ad56e79 union all 2015-09-10 15:59:22 +02:00
Ilion Beyst
7fe28494ce add issuer name to transactions query 2015-09-10 15:47:54 +02:00
benji
e593d0fda0 Merge pull request #5 from ZeusWPI/transaction_form
Transaction form
2015-09-10 15:44:41 +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
Ilion Beyst
7e251e19cb update transactions query to include peer 2015-09-10 15:05:53 +02:00
Felix Van der Jeugt
b51e56ee25 remove ordering arrows because ugly and useless 2015-09-10 15:00:48 +02:00
Felix Van der Jeugt
7bb2502b6f Merge branch 'master' into datagrid 2015-09-10 14:56:51 +02:00
Felix Van der Jeugt
e891f242e9 fix broken conversion 2015-09-10 14:47:50 +02:00
Felix Van der Jeugt
a3373b019c convert datagrid partials to haml 2015-09-10 14:35:17 +02:00
benji
f5d3a58bbb Move inline form to users#show 2015-09-10 14:12:05 +02:00
Ilion Beyst
06e3a5821e set baby steps in the transactions query 2015-09-10 14:04:39 +02:00
Felix Van der Jeugt
870fb16f00 add datagrid partials to allow pretty tables 2015-09-10 13:53:27 +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
00272f34ee better filtering 2015-09-10 13:25:25 +02:00
benji
0da73da377 Finish api tests 2015-09-10 12:11:37 +02:00
Felix Van der Jeugt
9bde05abbb attempt to do this the long way once more 2015-09-10 12:09:30 +02:00
benji
cc07c17eff Fix working api test 2015-09-10 11:39:52 +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
Ilion Beyst
da7fb11b78 style user transaction table 2015-09-09 21:26:26 +02:00
Felix Van der Jeugt
1957e3854a parse ranges and return some data about the filtering 2015-09-09 21:09:19 +02:00
Ilion Beyst
4fa9a01c73 add column breakpoints 2015-09-09 20:54:22 +02:00
Felix Van der Jeugt
6f7da1dd5b add types to the input fields 2015-09-09 20:18:30 +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
Ilion Beyst
4173275e96 make datatable responsive 2015-09-09 19:37:23 +02:00
Felix Van der Jeugt
7eb32bf1c3 Merge branch 'master' into filter-datatables 2015-09-09 18:17:55 +02:00
benji
86b751fb81 Keep selected value in select2 when creating transaction fails 2015-09-09 17:56:27 +02:00
Ilion Beyst
160e68b1a5 Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-09 17:55:22 +02:00
benji
a1b3326b73 Add pure css grids 2015-09-09 17:43:50 +02:00
Ilion Beyst
e4bdeea61a Merge branch 'api' 2015-09-09 17:39:17 +02:00