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
benji
11024261d9
Add number of requests and notifications in header
2017-01-10 17:22:11 +01:00
benji
51460a97b7
Annotations
2017-01-09 16:41:24 +01:00
benji
1e88bdd63a
Clean redundant code
2017-01-09 16:40:58 +01:00
benji
220a1e6684
Euro signs
2017-01-09 16:25:08 +01:00
benji
4a631bc0c2
Add notifications about requests
2017-01-09 16:22:58 +01:00
benji
4748625502
Make requests for money
2017-01-09 15:46:43 +01:00
benji
cc12ad3b7a
Upgrade to ruby 2.3.1
2017-01-09 13:31:31 +01:00
Rien
515f390488
Merge pull request #29 from ZeusWPI/fix_timezone
...
Set timezone
2016-08-08 14:12:34 +02:00
Rien
0b83509fb0
Set timezone
...
Fix incorrect timestamps
2016-08-08 13:12:02 +02:00
benji
8a9e9d9184
Use decent escaping of special characters in transaction messages
2016-05-20 15:08:14 +02:00
benji
50d27561e4
escape shit
2016-03-21 11:54:32 +01:00
benji
5a8aed99ec
Merge pull request #23 from ZeusWPI/currency_symbol
...
EUROES
2016-02-18 19:55:51 +01:00
Stijn Seghers
61afbfa771
EUROES
2016-02-18 19:53:43 +01:00
benji
36fbf1a8f8
Format the balance of user
2016-02-17 15:45:00 +01:00
benji
8306271bd9
Remove unused private method
2016-02-17 15:20:12 +01:00
benji
03a86f89af
Make landing page responsive.
2016-02-17 15:09:49 +01:00
benji
d9714b853d
Add link to root_path in menu
2016-02-17 13:21:21 +01:00
benji
d2df3d2517
Remove 'True' flash message when session expires.
...
This is because devise uses flash to store logic, instead of only
information that has to be given to the user. The 'timedout' key has
been removed from the flash hash. This should be reverted when devise
changes this.
2016-02-17 12:15:39 +01:00
benji
92067ab89d
Merge pull request #21 from ZeusWPI/user-table-fix
...
User table fix fix, add zeus bank account nr
2016-02-16 13:07:20 +01:00
benji
f376e029f4
Merge branch 'master' of github.com:ZeusWPI/Tab
2016-02-16 13:06:27 +01:00
benji
92ce6edb26
Change shameful balance to 0
2016-02-16 13:06:20 +01:00
tl3ilaxu
8c90927898
Add gaint zeus account nr
2016-02-12 00:18:59 +01:00
tl3ilaxu
166820ddfe
Add gaint zeus account nr
2016-02-12 00:18:13 +01:00
tl3ilaxu
692de0228e
Merge branch 'master' of https://github.com/ZeusWPI/Tab into user-table-fix
2016-02-11 17:30:34 +01:00
tl3ilaxu
5c79a8860f
Fix table responsiveness
2016-02-11 17:29:26 +01:00
benji
b0c0c76b21
Merge pull request #20 from ZeusWPI/user-table-fix
...
Fix horrible user index
2016-02-11 17:13:44 +01:00
tl3ilaxu
bfe3d9bba5
Fix user index
2016-02-11 17:03:57 +01:00
benji
812343f1ac
Merge pull request #19 from ZeusWPI/fix/17
...
fix #17 and s/Bedrag/Amount
2016-02-10 20:52:01 +01:00
Felix Van der Jeugt
305939712f
fix #17 and s/Bedrag/Amount
2016-02-10 20:50:42 +01:00
benji
dabfda6936
Merge pull request #18 from ZeusWPI/fix/16
...
fix #16
2016-02-10 20:44:01 +01:00
Felix Van der Jeugt
227903c88f
fix #16
2016-02-10 20:32:43 +01:00
benji
ac2dbee62b
Privacy and stuff
2016-02-10 15:23:16 +01:00
benji
524f3194ff
Fix failing test
2016-02-04 13:48:01 +01:00
benji
ccc7b987dd
Return new user instead of nil to avoid parse errors
2016-02-04 13:45:12 +01:00
benji
53f1a0a44f
Put confirmation and maximum limit on transaction amount
2016-02-02 18:34:19 +01:00
benji
4faf3e36ab
More stuff
2016-02-02 17:49:32 +01:00
benji
aa2b22358a
Return balance for non-existing user
2016-02-02 15:24:26 +01:00
benji
61a85146ea
Return a new user when it doesn't exist
2016-02-02 15:20:29 +01:00
benji
8c000efd9c
fix travis
2016-02-01 19:31:06 +01:00
benji
d128b2c1c0
Merge pull request #15 from ZeusWPI/bug/7/select2html5
...
Fix #7
2016-02-01 19:25:38 +01:00
benji
189ce731e0
Fix #7
2016-02-01 19:21:21 +01:00
benji
b44bdf597f
Fix #13
2016-02-01 13:30:47 +01:00
benji
d5e547a555
A little margin never hurt nobody
2016-02-01 13:22:47 +01:00
Tom Naessens
19f4863368
Fix errbit host
2015-11-29 15:19:04 +01:00
Felix Van der Jeugt
fa555938f4
fix paragraph shit
2015-09-18 13:34:37 +02:00
Felix Van der Jeugt
7da6b0fed6
Merge pull request #10 from ZeusWPI/cute-little-statistics
...
Cute little statistics
2015-09-17 18:30:39 +02:00
Felix Van der Jeugt
4aebb0be59
improve landing page
2015-09-17 18:23:21 +02:00
