Jan Tuomi
51e16df08b
Fix model form issues
2017-09-25 22:19:00 +03:00
Jan Tuomi
6954cc7f10
Refactor members views
2017-09-25 19:18:23 +03:00
Jan Tuomi
a99544f967
Fix more pep8 badlings
2017-09-20 23:35:41 +03:00
Jan Tuomi
68f587f776
Merge branch 'develop' into feature-pep8-fixes
2017-09-20 23:32:41 +03:00
Jan Tuomi
b0edaae32e
Remove conflict resolver and add dynamic payments
2017-09-20 23:19:50 +03:00
henu
08710b3705
Fix members pep8 and add docstrings
2017-09-20 21:00:58 +03:00
Jan Tuomi
f534244dd8
Fix logging in all modules
2017-09-19 19:31:43 +03:00
Jan Tuomi
c36ef9ad3f
Fix payment reference issue with duplicate resolver
2017-06-01 18:39: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
6b3e105bb7
Make lights go green again 💚
2017-05-27 12:15:59 +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
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
Aarni
2834da0934
Email new member on request and accept
2017-05-24 21:03:55 +03:00
Jan Tuomi
a2fb923220
Fix all pep8 and eslint errors :0
2017-05-21 16:28:47 +03:00
Jan Tuomi
80313a7765
Fix "add many" and csv import and export
2017-05-18 13:47:12 +03:00
Jan Tuomi
cae57d973e
Add payment edit and delete
...
Application editing still WIP
2017-05-17 13:28:06 +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
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
f5dd72c6c4
Fix CSV separator stripping bug in csv import
2017-04-06 20:32:09 +03:00
henu
a947f21652
Change memberRequest model to Request model
2017-03-29 19:37:56 +03:00
henu
8249819e27
Merge branch 'develop' into feature-payment
2017-03-29 19:15:48 +03:00
okalintu
af6a56e238
modify buch of http's to https
2017-03-29 16:54:26 +03:00
Jan Tuomi
312ed57714
Move changes from feature-member
2017-03-22 19:09:58 +02:00
Jan Tuomi
08b4c17044
Revert "[Members] Made frontend to use mainly rest api"
...
This reverts commit 75418da403 .
2017-03-08 17:23:41 +02:00
Henri Varjotie
75418da403
[Members] Made frontend to use mainly rest api
2017-03-01 18:41:41 +02:00
henu
bb206712e4
Implemented rest api to member requests
2017-02-22 18:37:34 +02:00
henu
7b486d640b
Added custom permission class to members rest api
2017-02-22 18:02:15 +02:00
henu
4beefd13a4
Added django rest framework to members
2017-02-22 17:13:15 +02:00
Jan Tuomi
990d6b853f
Move templates in members app to templates dir
...
This is kind of a huge, monolithic commit. Templates were being served
as static files, so Django template tags could not be used for, e.g.
internationalization. Now all html files are served as Django templates.
2017-02-05 16:39:49 +02:00
Jan Tuomi
d8dc064eb6
Fix a bunch of PEP8 violations
2017-01-19 17:55:59 +02:00
Aarni
23132386bb
Debug log moved to Home by default
...
...Vittusaatana...
2016-12-10 19:17:52 +02:00
henu
90b4175b03
Added comment before logger
2016-12-02 19:12:51 +02:00
henu
d19e148102
Added logger function to members app
2016-12-02 19:11:35 +02:00
henu
52bdac5fd9
Created loadCSV to memberlist
2016-11-16 18:12:03 +02:00
henu
b494d75de6
Captcha working on application and redirection after sending application
2016-10-25 19:33:29 +03:00
HooVee
95bc30e1eb
Fixed bugs, put key to html form
2016-09-27 21:59:30 +03:00
HooVee
4955fe695c
Added reCaptcha to application form
2016-09-27 21:13:00 +03:00