Commit Graph

205 Commits

Author SHA1 Message Date
Jan Tuomi f534244dd8 Fix logging in all modules 2017-09-19 19:31:43 +03:00
Juhana Luomanen b16bef536e Fix admin site header. Resolve issue #71 2017-09-13 19:44:44 +03:00
Jan Tuomi b37d5f2f55 Fix translation issue in payment form 2017-06-04 13:24:54 +03:00
Juhana Luomanen 350112c5d1 Merge branch 'feature-infoadmin' into develop 2017-06-01 19:40:18 +03:00
henu 1fd830b51e Add translations to member counter 2017-06-01 19:23:51 +03:00
henu e6328fdf87 Add member count to member list 2017-06-01 19:16:52 +03:00
Jan Tuomi c36ef9ad3f Fix payment reference issue with duplicate resolver 2017-06-01 18:39:26 +03:00
Juhana Luomanen a1171afc56 Merge branch 'develop' into feature-infoadmin 2017-06-01 18:04:26 +03:00
Jan Tuomi 5c8dfdfd1d Add settings value for automatic emails
Resolves #54
2017-05-29 23:26:36 +03:00
Jan Tuomi 26f4d28003 Finalize duplicate resolver styles
Also try-except the email sending code
2017-05-29 22:59:38 +03:00
Jan Tuomi 3a8d988033 Implement conflict resolution logic 2017-05-29 22:00:29 +03:00
Jan Tuomi 09e8c93e8d Create view and model for duplicate member conflicts 2017-05-28 23:40:47 +03:00
Jan Tuomi 95fe21d599 Fix style problem where hamburger menu button was on top of page title 2017-05-27 13:59:13 +03:00
Jan Tuomi 362c341966 Fix sidebar styles 2017-05-27 13:53:23 +03:00
Jan Tuomi 6b3e105bb7 Make lights go green again 💚 2017-05-27 12:15:59 +03:00
Jan Tuomi 7d2953b389 Add throttles.py for DRF 2017-05-27 11:50:00 +03:00
Jan Tuomi 9276f4cafb Merge feature-sidebar with conflicts 2017-05-27 11:30:22 +03:00
Jan Tuomi e9fbc38b4d Remove dead code and fix tokens error 2017-05-27 11:04:59 +03:00
Jan Tuomi f587c69435 Make model names translatable 2017-05-27 10:57:16 +03:00
henu 14ed32931b Fix sidebar transition and styling 2017-05-25 19:17:51 +03:00
henu 54612e31ca Add REST API support to members
Members can be now retrieved one at a time is user has admin rights.
Implemented also permissions and throttle rates to REST API and added
required settings.py modifications to settings-sample.py file.
2017-05-25 17:06:44 +03:00
henu 90177ab9fc Fix Member model method last_paid
The last_paid method used DoesNotExist exception to handle situation
where no proper payment models were found. However, the syntax was
wrong and it should have used Payment.DoesNotExist. This was fixed.
2017-05-25 17:00:31 +03:00
Aarni 2834da0934 Email new member on request and accept 2017-05-24 21:03:55 +03:00
Jan Tuomi 50fec558c2 Add "last paid" column to member list 2017-05-24 18:22:33 +03:00
Jan Tuomi a10ccec5f0 Housekeeping 2017-05-21 18:08:10 +03:00
Jan Tuomi a2fb923220 Fix all pep8 and eslint errors :0 2017-05-21 16:28:47 +03:00
Jan Tuomi bb70c101d6 Move libraries into their own directory
Resolves #50
2017-05-19 15:39:50 +03:00
Jan Tuomi a34a44ed95 Write some tests and configs for testing 2017-05-18 23:21:05 +03:00
Jan Tuomi c64cf7a7cc Clean up repo and remove docker 2017-05-18 15:49:04 +03:00
Jan Tuomi 80313a7765 Fix "add many" and csv import and export 2017-05-18 13:47:12 +03:00
Jan Tuomi 22e3727320 Remove outdated and failing test case 2017-05-17 15:01:04 +03:00
Jan Tuomi cae57d973e Add payment edit and delete
Application editing still WIP
2017-05-17 13:28:06 +03:00
Jan Tuomi 2b5101566c Mobile styles 2017-05-13 12:15:20 +03:00
Jan Tuomi 850ff0a74d Add notification system to replace noty 2017-05-13 11:19:39 +03:00
Jan Tuomi b798f62a6b Forgot to stage files :0 2017-05-13 10:43:23 +03:00
Jan Tuomi fa13842e5f More general fixes, add error page 2017-05-13 10:40:38 +03:00
Jan Tuomi 44e8ffb57d Members style cleanup, starting to look good 2017-05-13 01:19:37 +03:00
Jan Tuomi 9a87ba56b5 Start using django_tables2 for table processing 2017-05-13 00:18:01 +03:00
Jan Tuomi 74746fc0de More members overhaul
Relates to #44
2017-05-12 21:19:01 +03:00
Jan Tuomi 3a468b9c39 Add payment list view
Relates to #44
2017-05-12 15:03:37 +03:00
Jan Tuomi c5443d25b4 Make application list work in a basic sense 2017-05-11 23:25:59 +03:00
Jan Tuomi 8707cda7bc Clean up and remove tommy :( 2017-05-11 22:43:23 +03:00
Jan Tuomi 7b178ab1f7 Purge Angular from member register, WIP 2017-05-11 22:25:37 +03:00
Jan Tuomi 189f0dd30d Use Django forms in members, WIP 2017-05-11 09:01:30 +03:00
Jan Tuomi 3b770343a0 Merge branch 'feature-payment' into develop 2017-05-10 20:37:29 +03:00
Jan Tuomi 56b6cf4893 Merge remote-tracking branch 'origin/feature-payment' into feature-payment 2017-05-10 19:54:42 +03:00
Jan Tuomi 3f73a94b83 Separate urls.py into modular pieces 2017-04-06 21:03:43 +03:00
Jan Tuomi f5dd72c6c4 Fix CSV separator stripping bug in csv import 2017-04-06 20:32:09 +03:00
Juhana Luomanen 3855fb5179 Fix add_many_member footer problem 2017-03-31 00:25:56 +03:00
henu a947f21652 Change memberRequest model to Request model 2017-03-29 19:37:56 +03:00