Commit graph

347 commits

Author SHA1 Message Date
Rien Maertens
c25820ad3f
Downgrade back to rails 1.10.0 2018-08-07 19:03:42 +02:00
Rien Maertens
d89385557d
Merge branch 'herbert' 2018-08-06 20:18:42 +02:00
Rien Maertens
a2df79d9d1
Tab runs on tab.zeus.gent 2018-08-06 19:51:30 +02:00
redfast00
f8dbcb7041
More detailed README 2018-07-26 21:01:48 +02:00
redfast00
000ee333dc
Update high_voltage version and stop capistrano from complaining 2018-07-25 20:37:49 +02:00
redfast00
ed8b870739
Updated Gemfile.lock 2018-07-25 16:42:27 +02:00
redfast00
b1e284b3b6
Prepare for herbert 2018-07-25 16:36:59 +02:00
redfast00
8c76018f96
Merge pull request #37 from ZeusWPI/api_token
Add user API token
2018-07-11 19:35:27 +02:00
Robbe Van Herck
e50743c30e Added newline at end of file 2018-06-20 19:31:00 +02:00
benji
e4703233c4
Merge pull request #36 from ZeusWPI/update_rails
Updated to Rails 5.2.0
2018-06-20 19:30:06 +02:00
Robbe Van Herck
01b403c99e Added reset token 2018-06-20 19:28:01 +02:00
Robbe Van Herck
1581a38026 Add user API token 2018-06-20 18:51:17 +02:00
Robbe Van Herck
049b7bc3e4 Updated to Rails 5.2.0 2018-06-20 18:02:33 +02:00
David Vandorpe
7e07debc91
Revert "Fix for WiNA"
This reverts commit eae4a3e99c.
2018-03-21 19:40:03 +01:00
David Vandorpe
5472067004
Revert "Fix permissions"
This reverts commit 8285874483.
2018-03-21 19:39:41 +01:00
David Vandorpe
8285874483
Fix permissions 2018-03-13 15:27:34 +01:00
David Vandorpe
eae4a3e99c
Fix for WiNA 2018-03-13 14:50:50 +01:00
Rien Maertens
b951230fa5
Use adams for oauth 2017-02-18 19:04:38 +01:00
benji
ccd227a8ba Clients should be able to ask users balance 2017-01-23 17:45:57 +01:00
benji
e63a245f42 Merge pull request #34 from ZeusWPI/client_roles
Client roles
2017-01-23 17:34:47 +01:00
benji
0a3c949d09 Fix tests 2017-01-23 17:22:29 +01:00
benji
9e7e793941 Add roles to clients 2017-01-23 16:59:04 +01:00
benji
f1682b1a4e Remove debug statement 2017-01-17 10:16:59 +01:00
benji
d0056fcd1b Revert "quick fix for production"
This reverts commit e6d84836c5.
2017-01-17 10:13:11 +01:00
benji
e6d84836c5 quick fix for production 2017-01-17 00:15:54 +01:00
benji
2b2adeda3f one last try for today 2017-01-17 00:11:21 +01:00
benji
f42d1ac12e i did it again 2017-01-16 23:59:28 +01:00
benji
e00fe73797 oops 2017-01-16 23:50:03 +01:00
benji
9248773e4a Relative paths 2017-01-16 23:47:48 +01:00
benji
d05e985850 mysql fail 2017-01-16 23:30:01 +01:00
benji
e0160fa90f this is going well 2017-01-16 23:23:49 +01:00
benji
99c5a8b266 for real? 2017-01-16 23:19:13 +01:00
benji
c4569551d9 FFS rails 2017-01-16 23:16:51 +01:00
benji
7e9fab3abe mysql bug 2017-01-16 23:03:37 +01:00
benji
e35fe64b9e Merge pull request #33 from ZeusWPI/layout
Layout
2017-01-16 22:28:02 +01:00
benji
38facba605 Add balance in menu 2017-01-16 22:20:21 +01:00
benji
915d051e8f useless file 2017-01-16 21:41:55 +01:00
benji
e7d88b7083 Change after_sign_in_page to root and add sign_out button 2017-01-16 21:40:09 +01:00
benji
c94738123a Add card view for open outgoing requests 2017-01-14 23:12:45 +01:00
benji
696c6aae53 Add issuer on landing page 2017-01-14 22:54:07 +01:00
benji
c5176aa479 Allow submitting of react form 2017-01-14 22:45:51 +01:00
benji
c160188af5 Add more info to the landing page 2017-01-14 16:22:44 +01:00
benji
af33a89790 Transaction form 2017-01-12 16:29:49 +01:00
benji
546d918700 Add transactions view 2017-01-11 21:18:23 +01:00
benji
d388226d32 Split up landing page for signed in and signed out users, and add new menu 2017-01-11 16:14:21 +01:00
benji
74aa636ae5 Merge pull request #31 from ZeusWPI/request-payments
Request payments
2017-01-11 14:56:01 +01:00
benji
a803d005a3 Authorize creating requests for users, and add links for pennings to zeus requests 2017-01-11 14:34:17 +01:00
benji
ad395945f2 Merge branch 'master' of github.com:ZeusWPI/Tab into request-payments 2017-01-11 14:14:06 +01:00
benji
4f56a078fa Merge pull request #32 from ZeusWPI/fancy-user-page
Fancy user page
2017-01-11 13:59:19 +01:00
benji
35fba66b39 Merge branch 'master' into fancy-user-page 2017-01-11 13:59:10 +01:00