Commit graph

279 commits

Author SHA1 Message Date
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
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
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
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
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
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
Felix Van der Jeugt
305939712f fix #17 and s/Bedrag/Amount 2016-02-10 20:50:42 +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
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
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
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
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
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
Felix Van der Jeugt
9302c3533b add distributions of debt sources and transaction amounts 2015-09-12 00:55:23 +02:00
Felix Van der Jeugt
c9010f59ee add shamepie -- the big slices are really gross! 2015-09-12 00:17:43 +02:00
Felix Van der Jeugt
eb2c85aa9f layout the table of shame 2015-09-11 23:49:27 +02:00
Felix Van der Jeugt
8f55d915e8 Merge branch 'master' into cute-little-statistics 2015-09-11 23:33:04 +02:00
Felix Van der Jeugt
24f8050ac9 implement simple wall of shame 2015-09-11 23:32:38 +02:00
benji
d44a7ab563 Ugly server debug hack 2015-09-11 22:41:43 +02:00
benji
29b51a63e2 i guess noctua removed this 2015-09-11 22:21:18 +02:00
benji
e6914babee Select2 on peer 2015-09-11 21:14:35 +02:00
benji
eb26d14e40 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-11 21:06:22 +02:00
benji
c3ea6dd433 Select2 on filter options 2015-09-11 21:05:00 +02:00
Ilion Beyst
a87f00ddbc collapsable filter div 2015-09-11 20:46:37 +02:00
Ilion Beyst
60b7a14a5d apparently exec_query fixes everything 2015-09-11 20:03:12 +02:00
benji
40f35be26c Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-11 18:23:07 +02:00
benji
c341c7213a Put default width on select2 2015-09-11 18:22:54 +02:00
Felix Van der Jeugt
3530fd1e5d add simplistic wall of shame 2015-09-11 18:04:45 +02:00
Ilion Beyst
6e192bb907 reload table on new transaction 2015-09-11 17:55:50 +02:00
Felix Van der Jeugt
e98950b336 remove console.log 2015-09-11 17:51:51 +02:00
Ilion Beyst
1472884ccb redirect to user page after sign in 2015-09-11 17:22:42 +02:00
Felix Van der Jeugt
b81bccabac initial commit for cute little statistics 2015-09-11 17:13:23 +02:00
benji
f9b6f17456 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-09-11 17:08:52 +02:00
benji
274059d10f btn - Zeus link - deploy 2015-09-11 17:08:46 +02:00
Ilion Beyst
39ee9a19a2 reverse transaction with negative amount 2015-09-11 16:35:46 +02:00
Felix Van der Jeugt
020a2b97e8 improve placeholders for date ranges 2015-09-11 16:34:09 +02:00
benji
b67e0954e3 Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 15:50:10 +02:00
Ilion Beyst
bd2c986604 order query on time 2015-09-11 15:51:15 +02:00
benji
3ec19abab3 diefstal is een misdrijf 2015-09-11 15:50:07 +02:00
benji
670d748d40 Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 15:18:42 +02:00
benji
5db705d8d4 Change styling filters to bootstrap 2015-09-11 15:18:36 +02:00
Ilion Beyst
8293662fff allow negative amounts to swap creditor and debtor 2015-09-11 15:16:20 +02:00
benji
bd5f444869 Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 14:52:59 +02:00
benji
3d145d6e54 Add bootstrap 2015-09-11 14:52:26 +02:00
Ilion Beyst
bb9d4bc371 friendly ids! 2015-09-11 14:51:35 +02:00
Ilion Beyst
dbaded000f return forbidden for forbidden json requests 2015-09-11 14:32:24 +02:00
Ilion Beyst
2ea8124a01 fix lower bound in number filter 2015-09-11 14:24:28 +02:00
benji
315687ffad Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 14:12:59 +02:00
benji
ea14b6b472 typo 2015-09-11 14:12:54 +02:00
Ilion Beyst
9fea3a6ca4 format table values 2015-09-11 14:10:55 +02:00
benji
8d472c079b Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 13:17:07 +02:00
benji
a2681f9951 Remote transaction form 2015-09-11 13:16:53 +02:00
Ilion Beyst
4fad3416c0 fix general retartedness on my side 2015-09-11 12:07:43 +02:00
Ilion Beyst
bf9a845780 implement pagination 2015-09-11 12:07:43 +02:00
Felix Van der Jeugt
d336e778f7 improve (and fix) parsing 2015-09-11 11:55:33 +02:00
benji
dd7fc618b6 Make transaction form remote 2015-09-11 11:16:41 +02:00
benji
7c99a9229e Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables 2015-09-11 11:09:44 +02:00