TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,076 Commits 14 Branches 0 Tags
bc7a8ebd172e34ba969df48c8ea6aef348360465
Commit Graph

1076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aarni Halinen 5b44d2e4c7 Fix favicon 2018-09-10 21:08:37 +03:00
Aarni Halinen fa0954e8ca Merge branch 'develop' into 'master' 
Sosso infocreen fix, Django 2.0, Rest Framework

See merge request vtmk/web2.0!121
 2018-09-10 13:35:12 +03:00
Aarni Halinen 8552bde245 Fix members static file paths 2018-09-10 13:16:51 +03:00
Aarni Halinen 9a4d7fc498 Fix Sosso containers 2018-09-10 12:04:50 +03:00
Aarni Halinen 6dea241408 Add missing import 2018-09-10 11:43:59 +03:00
Aarni Halinen b3b1bec12c Add special characters to Sosso infoscreen 2018-09-10 11:40:57 +03:00
Aarni Halinen 02cc305abf Fix indentation 2018-09-02 22:27:14 +03:00
Aarni Halinen ffe0c45eea Fix few kaehmy problems 
- Fix variable naming in statistics
- Add scope for html files to fix rendering of errors
- Fix footer.css path and remove duplicate
 2018-09-02 22:23:52 +03:00
Aarni Halinen 499ddc0979 New kaehmy BaseRole class 2018-09-02 22:03:54 +03:00
Aarni Halinen b154ffb79e Add normal permissions to DRF root 2018-08-21 19:27:18 +03:00
Aarni Halinen 87dfab0e57 Change dev server port on gitlab-ci.yml 2018-08-15 23:37:40 +03:00
Aarni Halinen 92ec8b1b4e Dev server docker and host ports to 8000 2018-08-15 23:32:41 +03:00
Aarni Halinen ac8fb0bfe3 Set authentication to webapp DRF 2018-07-24 19:09:42 +03:00
Aarni Halinen 0ce6af8f7c Fix import and redefinition issues 2018-07-24 18:30:21 +03:00
Aarni Halinen 053b705cc1 Merge branch 'Django2.0' into 'develop' 
:Django2.0

See merge request vtmk/web2.0!115
 2018-07-24 18:29:00 +03:00
Aarni Halinen 3676f23f65 Fix payment autocomplete permissions and remove test skips 
Fixed decorators in urls.py. Moved to method_decorators on view class
 2018-07-24 18:19:57 +03:00
Aarni Halinen 7e821f277f Fix pycodestyle 2018-07-23 12:38:14 +03:00
Aarni Halinen 91cbdef71f Merge branch 'develop' into 'Django2.0' 
# Conflicts:
#   webapp/urls.py
 2018-07-18 20:44:23 +03:00
Aarni Halinen 0cfb78bc69 Remove not used api_view 2018-07-18 20:40:44 +03:00
Aarni Halinen 01c20b1a6e Add contacts API 2018-07-18 20:40:19 +03:00
Aarni Halinen 1711aca5ec Add templatequestions API 2018-07-18 20:39:08 +03:00
Aarni Halinen c536899cc9 Bring about page back 2018-07-18 20:12:06 +03:00
Aarni Halinen 60da9d8256 Add event update serializer 2018-07-18 20:11:24 +03:00
Aarni Halinen a923e225e8 API root to /api 2018-07-18 18:41:20 +03:00
Aarni Halinen 2d7c9d779a Feed API added 2018-07-18 18:37:01 +03:00
Aarni Halinen aea9898563 Skip failing autocomplete test 2018-07-17 22:00:39 +03:00
Aarni Halinen 4e3f71ea43 Remove duplicate imports 2018-07-17 22:00:08 +03:00
Aarni Halinen 6acbdbc760 Update to Django 2.0.7 for sqlite bugfix 2018-07-17 21:37:23 +03:00
Aarni Halinen 11b6e68fe1 Remove password_reset and own login, redirect to admin/login 
Django admin login to be used. Thus we should be able to upgrade to
Django2.0
 2018-07-17 20:58:13 +03:00
Aarni Halinen cc3aa66e49 Merge branch 'develop' into Django2.0 2018-07-17 20:57:58 +03:00
Aarni Halinen 563344e8b4 Merge branch 'feature-events' into 'develop' 
Basic API for events

See merge request vtmk/web2.0!120
 2018-07-17 18:43:01 +03:00
Aarni Halinen 129b8e4601 Use id instead of url for SignUpSerializer 2018-07-10 22:42:37 +03:00
Aarni Halinen efde69984d Revert changes to base.py 2018-07-10 22:42:05 +03:00
Aarni Halinen c66c8e7367 Rest framework for Event and SignupForm 2018-07-10 22:33:26 +03:00
Aarni Halinen c31f454c78 Move signup models back to webapp 2018-07-05 18:58:33 +03:00
Aarni Halinen 18926d16d1 Create new signup related models 2018-06-19 20:46:06 +03:00
Aarni Halinen 4e8adebb2d Move Event and Registration model to own app 2018-06-05 19:33:35 +03:00
Aarni Halinen 0207bdf22b Upgrade psycopg2 2018-05-31 17:26:49 +03:00
Aarni Halinen 5caacd8f44 Add and fix translations 2018-05-22 23:54:58 +03:00
Aarni Halinen d7a3433d2c Merge branch 'feature-contacts' into develop 
Conflicts:
	webapp/admin.py
	webapp/models.py
	webapp/views.py
 2018-05-16 22:49:38 +03:00
Aarni Halinen 6e68e106aa Update contact models and template 2018-05-16 22:39:43 +03:00
Aarni Halinen aeda06374d Merge branch 'develop' into 'master' 
Filter paid member fees by date

See merge request vtmk/web2.0!118
 2018-05-14 01:45:07 +03:00
Aarni Halinen 9225ff5967 Filter paid member fees by date 2018-05-14 01:36:11 +03:00
Aarni Halinen ac64a1766f Merge branch 'develop' into 'master' 
Member features into master

Closes #103

See merge request vtmk/web2.0!117
 2018-05-13 13:35:50 +03:00
Aarni Halinen 6996bb8015 Merge branch 'feature-number-of-members' into 'develop' 
Show number of paid members in member list

See merge request vtmk/web2.0!116
 2018-05-13 13:15:30 +03:00
Aarni Halinen 7aff7c46ee Fix pycodestyle 2018-05-13 13:06:19 +03:00
Aarni Halinen 882732d054 Show number of paid members in member list 
Member filtering also applies to this feature. Moved 'last_paid' Subquery to Member method
 2018-05-13 13:02:27 +03:00
Aarni Halinen 9e0d911f7b Fix date rendering 2018-05-09 22:16:40 +03:00
Aarni Halinen ab6b7d19fb Update pyexcel 2018-05-09 21:24:36 +03:00
Aarni Halinen b95be67051 Fix pycodestyle 2018-05-09 20:24:16 +03:00