Merge branch 'master' into frekk-testing
Showing
- .gitlab-ci.yml 86 additions, 0 deletions.gitlab-ci.yml
- pip-packages.txt 2 additions, 0 deletionspip-packages.txt
- src/gms/__init__.py 1 addition, 0 deletionssrc/gms/__init__.py
- src/gms/context_processors.py 6 additions, 0 deletionssrc/gms/context_processors.py
- src/gms/settings.py 83 additions, 81 deletionssrc/gms/settings.py
- src/gms/settings_local.example.py 45 additions, 37 deletionssrc/gms/settings_local.example.py
- src/gms/wsgi.py 15 additions, 1 deletionsrc/gms/wsgi.py
- src/gms/wsgi.py 15 additions, 1 deletionsrc/gms/wsgi.py
- src/memberdb/account.py 151 additions, 0 deletionssrc/memberdb/account.py
- src/memberdb/account_backend.py 295 additions, 0 deletionssrc/memberdb/account_backend.py
- src/memberdb/admin.py 112 additions, 90 deletionssrc/memberdb/admin.py
- src/memberdb/approve.py 2 additions, 2 deletionssrc/memberdb/approve.py
- src/memberdb/forms.py 8 additions, 1 deletionsrc/memberdb/forms.py
- src/memberdb/makehomes.sh 0 additions, 0 deletionssrc/memberdb/makehomes.sh
- src/memberdb/models.py 201 additions, 170 deletionssrc/memberdb/models.py
- src/memberdb/register.py 140 additions, 107 deletionssrc/memberdb/register.py
- src/memberdb/root_actions.py 68 additions, 0 deletionssrc/memberdb/root_actions.py
- src/memberdb/urls.py 1 addition, 1 deletionsrc/memberdb/urls.py
- src/memberdb/views.py 21 additions, 1 deletionsrc/memberdb/views.py
- src/squarepay/dispense.py 66 additions, 33 deletionssrc/squarepay/dispense.py
Please register or sign in to comment