Merge remote-tracking branch 'origin/master' into activity
Showing
- apps/member/models.py 14 additions, 0 deletionsapps/member/models.py
- apps/member/urls.py 2 additions, 2 deletionsapps/member/urls.py
- apps/member/views.py 19 additions, 50 deletionsapps/member/views.py
- apps/note/api/serializers.py 5 additions, 1 deletionapps/note/api/serializers.py
- apps/note/api/views.py 21 additions, 1 deletionapps/note/api/views.py
- apps/note/fixtures/button.json 58 additions, 0 deletionsapps/note/fixtures/button.json
- apps/note/fixtures/initial.json 0 additions, 56 deletionsapps/note/fixtures/initial.json
- apps/note/forms.py 0 additions, 11 deletionsapps/note/forms.py
- apps/note/models/notes.py 6 additions, 2 deletionsapps/note/models/notes.py
- apps/note/models/transactions.py 34 additions, 0 deletionsapps/note/models/transactions.py
- apps/note/tables.py 57 additions, 20 deletionsapps/note/tables.py
- apps/permission/fixtures/initial.json 2 additions, 2 deletionsapps/permission/fixtures/initial.json
- locale/de/LC_MESSAGES/django.po 82 additions, 37 deletionslocale/de/LC_MESSAGES/django.po
- locale/fr/LC_MESSAGES/django.po 73 additions, 32 deletionslocale/fr/LC_MESSAGES/django.po
- static/js/alias.js 37 additions, 0 deletionsstatic/js/alias.js
- static/js/base.js 23 additions, 5 deletionsstatic/js/base.js
- static/js/consos.js 26 additions, 5 deletionsstatic/js/consos.js
- static/js/transfer.js 63 additions, 15 deletionsstatic/js/transfer.js
- templates/base.html 2 additions, 0 deletionstemplates/base.html
- templates/member/add_members.html 8 additions, 4 deletionstemplates/member/add_members.html
Loading
Please register or sign in to comment