Merge branch 'master' into coffee-testing
Showing
- README.md 21 additions, 22 deletionsREADME.md
- pip-packages.txt 12 additions, 11 deletionspip-packages.txt
- src/gms/settings.py 8 additions, 4 deletionssrc/gms/settings.py
- src/gms/settings_local.example.py 37 additions, 17 deletionssrc/gms/settings_local.example.py
- src/import_members/actions.py 11 additions, 4 deletionssrc/import_members/actions.py
- src/memberdb/account_backend.py 2 additions, 2 deletionssrc/memberdb/account_backend.py
- src/memberdb/actions.py 21 additions, 0 deletionssrc/memberdb/actions.py
- src/memberdb/admin.py 45 additions, 21 deletionssrc/memberdb/admin.py
- src/memberdb/has_paid_dispense.sh 0 additions, 16 deletionssrc/memberdb/has_paid_dispense.sh
- src/memberdb/models.py 25 additions, 19 deletionssrc/memberdb/models.py
- src/memberdb/register.py 9 additions, 2 deletionssrc/memberdb/register.py
- src/memberdb/views.py 7 additions, 1 deletionsrc/memberdb/views.py
- src/squarepay/cokelog.py 125 additions, 0 deletionssrc/squarepay/cokelog.py
- src/squarepay/migrations/0001_initial.py 0 additions, 38 deletionssrc/squarepay/migrations/0001_initial.py
- src/squarepay/migrations/__init__.py 0 additions, 0 deletionssrc/squarepay/migrations/__init__.py
- src/squarepay/tests.py 27 additions, 1 deletionsrc/squarepay/tests.py
- src/squarepay/views.py 1 addition, 1 deletionsrc/squarepay/views.py
- src/static/admin_custom.css 2 additions, 2 deletionssrc/static/admin_custom.css
- src/static/memberdb.css 42 additions, 1 deletionsrc/static/memberdb.css
- src/templates/base.html 11 additions, 0 deletionssrc/templates/base.html
Please register or sign in to comment