Merge branch 'beta' into 'master'
Corrections diverses See merge request !123
No related branches found
No related tags found
Showing
- apps/activity/models.py 4 additions, 2 deletionsapps/activity/models.py
- apps/activity/views.py 3 additions, 0 deletionsapps/activity/views.py
- apps/member/forms.py 3 additions, 1 deletionapps/member/forms.py
- apps/member/models.py 10 additions, 3 deletionsapps/member/models.py
- apps/member/templates/member/includes/profile_info.html 2 additions, 2 deletionsapps/member/templates/member/includes/profile_info.html
- apps/member/views.py 4 additions, 0 deletionsapps/member/views.py
- apps/note/api/views.py 29 additions, 21 deletionsapps/note/api/views.py
- apps/note/models/notes.py 9 additions, 1 deletionapps/note/models/notes.py
- apps/note/models/transactions.py 15 additions, 13 deletionsapps/note/models/transactions.py
- apps/note/static/note/js/consos.js 0 additions, 2 deletionsapps/note/static/note/js/consos.js
- apps/note/static/note/js/transfer.js 0 additions, 0 deletionsapps/note/static/note/js/transfer.js
- apps/note/templates/note/conso_form.html 9 additions, 9 deletionsapps/note/templates/note/conso_form.html
- apps/note/templates/note/transaction_form.html 11 additions, 11 deletionsapps/note/templates/note/transaction_form.html
- apps/note/views.py 1 addition, 1 deletionapps/note/views.py
- apps/permission/decorators.py 3 additions, 4 deletionsapps/permission/decorators.py
- apps/permission/fixtures/initial.json 117 additions, 4 deletionsapps/permission/fixtures/initial.json
- apps/permission/models.py 1 addition, 0 deletionsapps/permission/models.py
- apps/permission/permissions.py 1 addition, 0 deletionsapps/permission/permissions.py
- apps/permission/views.py 2 additions, 0 deletionsapps/permission/views.py
- apps/registration/forms.py 1 addition, 1 deletionapps/registration/forms.py
Loading
Please register or sign in to comment