Commit graph

62 commits

Author SHA1 Message Date
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
benji
d948071e49 Put authentication on api 2015-09-09 14:08:40 +02:00
Ilion Beyst
3d8b1e9c60 fix transactions cretate 2015-09-09 13:33:55 +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
3a659485a6 Merge branch 'master' into api 2015-09-09 12:56:34 +02:00
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