Merge remote-tracking branch 'origin/master' into import_nk15
# Conflicts: # apps/treasury/signals.py
No related branches found
No related tags found
Showing
- .env_example 2 additions, 0 deletions.env_example
- README.md 2 additions, 0 deletionsREADME.md
- apps/activity/forms.py 1 addition, 1 deletionapps/activity/forms.py
- apps/activity/models.py 2 additions, 2 deletionsapps/activity/models.py
- apps/activity/views.py 13 additions, 6 deletionsapps/activity/views.py
- apps/api/urls.py 2 additions, 0 deletionsapps/api/urls.py
- apps/member/forms.py 10 additions, 2 deletionsapps/member/forms.py
- apps/member/models.py 75 additions, 8 deletionsapps/member/models.py
- apps/member/views.py 36 additions, 21 deletionsapps/member/views.py
- apps/note/api/serializers.py 31 additions, 0 deletionsapps/note/api/serializers.py
- apps/note/api/urls.py 2 additions, 1 deletionapps/note/api/urls.py
- apps/note/api/views.py 26 additions, 2 deletionsapps/note/api/views.py
- apps/note/forms.py 2 additions, 6 deletionsapps/note/forms.py
- apps/note/models/transactions.py 14 additions, 2 deletionsapps/note/models/transactions.py
- apps/note/signals.py 4 additions, 5 deletionsapps/note/signals.py
- apps/note/tables.py 3 additions, 2 deletionsapps/note/tables.py
- apps/note/views.py 30 additions, 2 deletionsapps/note/views.py
- apps/permission/backends.py 24 additions, 11 deletionsapps/permission/backends.py
- apps/permission/fixtures/initial.json 2458 additions, 1183 deletionsapps/permission/fixtures/initial.json
- apps/permission/models.py 30 additions, 11 deletionsapps/permission/models.py
Loading
Please register or sign in to comment