Merge remote-tracking branch 'origin/master' into tresorerie
# Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po # note_kfet/settings/base.py # templates/base.html
No related branches found
No related tags found
Showing
- README.md 7 additions, 6 deletionsREADME.md
- apps/activity/api/views.py 5 additions, 4 deletionsapps/activity/api/views.py
- apps/api/urls.py 8 additions, 3 deletionsapps/api/urls.py
- apps/api/viewsets.py 31 additions, 0 deletionsapps/api/viewsets.py
- apps/logs/api/views.py 2 additions, 2 deletionsapps/logs/api/views.py
- apps/logs/middlewares.py 0 additions, 55 deletionsapps/logs/middlewares.py
- apps/logs/signals.py 3 additions, 4 deletionsapps/logs/signals.py
- apps/member/api/serializers.py 1 addition, 0 deletionsapps/member/api/serializers.py
- apps/member/api/views.py 5 additions, 5 deletionsapps/member/api/views.py
- apps/member/forms.py 10 additions, 1 deletionapps/member/forms.py
- apps/member/models.py 8 additions, 9 deletionsapps/member/models.py
- apps/member/views.py 29 additions, 5 deletionsapps/member/views.py
- apps/note/admin.py 2 additions, 2 deletionsapps/note/admin.py
- apps/note/api/serializers.py 40 additions, 11 deletionsapps/note/api/serializers.py
- apps/note/api/views.py 23 additions, 87 deletionsapps/note/api/views.py
- apps/note/forms.py 1 addition, 50 deletionsapps/note/forms.py
- apps/note/models/__init__.py 2 additions, 2 deletionsapps/note/models/__init__.py
- apps/note/models/transactions.py 49 additions, 5 deletionsapps/note/models/transactions.py
- apps/note/tables.py 24 additions, 3 deletionsapps/note/tables.py
- apps/note/templatetags/pretty_money.py 1 addition, 1 deletionapps/note/templatetags/pretty_money.py
Loading
Please register or sign in to comment