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
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
benji
cbf491e49c
Move datatables to seperate controller and provide user#show api
2015-09-17 16:46:33 +02:00
Felix Van der Jeugt
a59dfd0d51
Merge branch 'master' into cute-little-statistics
2015-09-17 15:59:01 +02:00
Felix Van der Jeugt
41970612b2
apply fancyness
2015-09-17 13:16:13 +02:00
Felix Van der Jeugt
302b50ff63
fix select2 for submitting the filters
2015-09-17 12:43:29 +02:00
Felix Van der Jeugt
9191e12ce9
fix amount distribution, still ugly though
2015-09-14 17:30:52 +02:00
Felix Van der Jeugt
2a51355046
fix shamepie, break distribution
2015-09-14 17:21:53 +02:00
Felix Van der Jeugt
a88f94ba3a
improve seeds for the users and add clients
2015-09-14 16:50:47 +02:00
Felix Van der Jeugt
32e1ebfb94
Merge branch 'master' into cute-little-statistics
2015-09-14 16:32:45 +02:00
Felix Van der Jeugt
d0d7510532
better piechart of origins
2015-09-14 16:17:01 +02:00
Felix Van der Jeugt
6a86a418eb
show transaction distribution in euro's
2015-09-14 15:14:09 +02:00
benji
a477f42601
Creditor bug
2015-09-14 14:36:05 +02:00
benji
0cf5872a98
Add id_at_client to transactions + tests
2015-09-14 13:16:01 +02:00
benji
6c04a90f68
Return new transaction on create
2015-09-14 10:32:58 +02:00
Felix Van der Jeugt
54b8e8808b
Merge branch 'master' into cute-little-statistics
2015-09-12 15:46:45 +02:00
benji
8a1981b1b4
Add tests for api
2015-09-12 13:03:04 +02:00
benji
1b6f83f70a
typo oO
2015-09-12 12:26:02 +02:00
benji
cd939f2bf1
Create user when he/she doesn't exist yet and name provided through api
2015-09-12 12:21:12 +02:00
benji
1fba3b98be
Use http authorization to place api key
2015-09-12 10:51:37 +02:00
