Merge branch 'master' into 'explicit>implicit'
# Conflicts: # apps/activity/views.py
No related branches found
No related tags found
Showing
- apps/activity/fixtures/initial.json 20 additions, 0 deletionsapps/activity/fixtures/initial.json
- apps/activity/models.py 2 additions, 0 deletionsapps/activity/models.py
- apps/activity/views.py 6 additions, 1 deletionapps/activity/views.py
- apps/logs/models.py 4 additions, 0 deletionsapps/logs/models.py
- apps/member/forms.py 40 additions, 13 deletionsapps/member/forms.py
- apps/member/models.py 43 additions, 0 deletionsapps/member/models.py
- apps/member/signals.py 2 additions, 2 deletionsapps/member/signals.py
- apps/member/tables.py 20 additions, 0 deletionsapps/member/tables.py
- apps/member/urls.py 2 additions, 4 deletionsapps/member/urls.py
- apps/member/views.py 229 additions, 98 deletionsapps/member/views.py
- apps/note/admin.py 10 additions, 3 deletionsapps/note/admin.py
- apps/note/signals.py 6 additions, 5 deletionsapps/note/signals.py
- apps/note/views.py 13 additions, 4 deletionsapps/note/views.py
- apps/permission/fixtures/initial.json 427 additions, 258 deletionsapps/permission/fixtures/initial.json
- apps/permission/models.py 10 additions, 0 deletionsapps/permission/models.py
- apps/registration/__init__.py 4 additions, 0 deletionsapps/registration/__init__.py
- apps/registration/apps.py 10 additions, 0 deletionsapps/registration/apps.py
- apps/registration/forms.py 80 additions, 0 deletionsapps/registration/forms.py
- apps/registration/migrations/__init__.py 0 additions, 0 deletionsapps/registration/migrations/__init__.py
- apps/registration/tables.py 26 additions, 0 deletionsapps/registration/tables.py
Loading
Please register or sign in to comment