Commit graph

169 commits

Author SHA1 Message Date
Ilion Beyst
1233431d14 Added Zeus user 2015-09-08 21:38:29 +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
benji
272923d08d Convert erb to haml files 2015-09-08 19:39:13 +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
Ilion Beyst
20bb280482 Make transaction datatable actually work 2015-09-08 17:46:07 +02:00
benji
2f07856b67 Add authorization to user controller 2015-09-08 17:40:40 +02:00
Felix Van der Jeugt
15ba18fa59 merge remote branch into transaction-vc 2015-09-08 17:32:03 +02:00
Ilion Beyst
c3c13f428a Fixed ajax datatable 2015-09-08 17:30:13 +02:00
Felix Van der Jeugt
363c825e55 add create controller and dummy view 2015-09-08 17:30:02 +02:00
benji
52808c27df Merge pull request #2 from ZeusWPI/cancancan
Add ability of cancancan
2015-09-08 17:29:15 +02:00
benji
cdce071a91 Merge pull request #3 from ZeusWPI/users-vc
Add index and show action for users
2015-09-08 17:29:10 +02:00
benji
380bce6ed6 Add index and show action for users 2015-09-08 17:28:46 +02:00
benji
31d5d81c9b Add ability of cancancan 2015-09-08 17:18:38 +02:00
Felix Van der Jeugt
c1563980c4 show names in the creditor selection dropdown 2015-09-08 16:53:43 +02:00
Felix Van der Jeugt
e3a7996591 add task for sowing the development seeds 2015-09-08 16:45:46 +02:00
Ilion Beyst
b708319c3b Use haml! 2015-09-08 16:19:48 +02:00
Ilion Beyst
f1a95088d8 Merge branch 'transaction-vc' of github.com:ZeusWPI/Tab into transaction-vc 2015-09-08 16:16:32 +02:00
Ilion Beyst
22cc4c3422 Add index datatable 2015-09-08 16:16:19 +02:00
Felix Van der Jeugt
d11273c651 add pretty form for transactions 2015-09-08 16:13:03 +02:00
benji
eab254aa4a Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-08 15:51:26 +02:00
benji
599570f033 Add validations 2015-09-08 15:51:23 +02:00
Ilion Beyst
ec4f041986 fix foreign keys in mysql 2015-09-08 15:42:08 +02:00
Ilion Beyst
aadf615122 fix transaction foreign keys 2015-09-08 15:37:09 +02:00
Felix Van der Jeugt
993a54bd46 add transactions controller 2015-09-08 15:25:54 +02:00
Tom Naessens
9cbd5a141c Pin mysql again 2015-09-08 15:24:13 +02:00
Tom Naessens
ef9ca50b01 Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-08 15:22:31 +02:00
Tom Naessens
81d7b40190 Bundle update 2015-09-08 15:22:26 +02:00
benji
cbb3284622 Install purecss 2015-09-08 15:20:28 +02:00
benji
f2bc39b2b6 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-08 15:16:11 +02:00
benji
5df3327e72 Add landing page 2015-09-08 15:16:08 +02:00
Ilion Beyst
9a7c9686cc Install datatables 2015-09-08 15:15:17 +02:00
Ilion Beyst
f942157a2c Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-08 15:14:50 +02:00
Ilion Beyst
92ea144116 Add user controller and views 2015-09-08 15:14:46 +02:00
Tom Naessens
0909bdda3d Do bundle install 2015-09-08 15:13:24 +02:00
Tom Naessens
0c9b9b08b1 Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-08 15:12:40 +02:00
Tom Naessens
32a82c65ff Pls work 2015-09-08 15:12:35 +02:00
Ilion Beyst
04fa1a67e1 Use datatables 2015-09-08 15:12:28 +02:00
Ilion Beyst
1c1a3646ff Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-08 15:06:45 +02:00
Ilion Beyst
326ab59de5 Added pure css 2015-09-08 15:06:36 +02:00
Tom Naessens
308c089c7d Actually pin mysql2 2015-09-08 15:04:31 +02:00
Tom Naessens
8b41c5dc5d Pin mysql 2015-09-08 15:01:29 +02:00
Tom Naessens
02f36f5750 Look a comment 2015-09-08 14:55:37 +02:00
Tom Naessens
0d1b9674b8 Fix group name 2015-09-08 14:30:11 +02:00
Tom Naessens
87d02a1c8c Update mysql gem 2015-09-08 14:27:18 +02:00
Tom Naessens
a868cadd26 Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-08 14:25:26 +02:00
Ilion Beyst
8628e75d79 Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-08 14:26:20 +02:00
Ilion Beyst
1145b2f88d Merge branch 'master' of github.com:ZeusWPI/Tab 2015-09-08 14:26:11 +02:00