Merge branch 'master' into 'tranfer_front'
# Conflicts: # apps/activity/views.py # apps/permission/backends.py # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po # static/js/base.js # templates/base.html # templates/member/user_list.html
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/views.py 2 additions, 2 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/models/transactions.py 13 additions, 0 deletionsapps/note/models/transactions.py
- apps/note/signals.py 4 additions, 5 deletionsapps/note/signals.py
- apps/note/views.py 2 additions, 2 deletionsapps/note/views.py
- apps/permission/backends.py 21 additions, 16 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
- apps/permission/signals.py 12 additions, 3 deletionsapps/permission/signals.py
- apps/permission/urls.py 10 additions, 0 deletionsapps/permission/urls.py
- apps/permission/views.py 51 additions, 2 deletionsapps/permission/views.py
- apps/registration/forms.py 9 additions, 0 deletionsapps/registration/forms.py
- apps/registration/views.py 24 additions, 14 deletionsapps/registration/views.py
- apps/scripts 1 addition, 1 deletionapps/scripts
Loading
Please register or sign in to comment