Merge branch 'master' into 'devalidation_reason'
# Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po
No related branches found
No related tags found
Showing
- Dockerfile 5 additions, 0 deletionsDockerfile
- README.md 5 additions, 1 deletionREADME.md
- apps/api/urls.py 2 additions, 0 deletionsapps/api/urls.py
- apps/member/fixtures/initial.json 2 additions, 2 deletionsapps/member/fixtures/initial.json
- apps/member/models.py 14 additions, 0 deletionsapps/member/models.py
- apps/member/tables.py 1 addition, 0 deletionsapps/member/tables.py
- apps/member/urls.py 2 additions, 0 deletionsapps/member/urls.py
- apps/member/views.py 26 additions, 5 deletionsapps/member/views.py
- apps/note/fixtures/initial.json 3 additions, 18 deletionsapps/note/fixtures/initial.json
- apps/note/models/__init__.py 2 additions, 2 deletionsapps/note/models/__init__.py
- apps/note/templatetags/pretty_money.py 5 additions, 0 deletionsapps/note/templatetags/pretty_money.py
- apps/permission/admin.py 0 additions, 1 deletionapps/permission/admin.py
- apps/permission/api/views.py 1 addition, 1 deletionapps/permission/api/views.py
- apps/permission/models.py 0 additions, 2 deletionsapps/permission/models.py
- apps/permission/permissions.py 1 addition, 0 deletionsapps/permission/permissions.py
- apps/permission/signals.py 1 addition, 2 deletionsapps/permission/signals.py
- apps/permission/templatetags/perms.py 1 addition, 3 deletionsapps/permission/templatetags/perms.py
- apps/treasury/__init__.py 4 additions, 0 deletionsapps/treasury/__init__.py
- apps/treasury/admin.py 27 additions, 0 deletionsapps/treasury/admin.py
- apps/treasury/api/__init__.py 0 additions, 0 deletionsapps/treasury/api/__init__.py
Loading
Please register or sign in to comment