Merge branch 'master' into 'logging'
# Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- apps/member/urls.py 3 additions, 1 deletionapps/member/urls.py
- apps/member/views.py 114 additions, 15 deletionsapps/member/views.py
- apps/note/forms.py 46 additions, 0 deletionsapps/note/forms.py
- apps/note/models/notes.py 7 additions, 11 deletionsapps/note/models/notes.py
- apps/note/models/transactions.py 5 additions, 2 deletionsapps/note/models/transactions.py
- apps/note/tables.py 21 additions, 2 deletionsapps/note/tables.py
- apps/note/views.py 3 additions, 8 deletionsapps/note/views.py
- locale/de/LC_MESSAGES/django.po 74 additions, 50 deletionslocale/de/LC_MESSAGES/django.po
- locale/fr/LC_MESSAGES/django.po 81 additions, 54 deletionslocale/fr/LC_MESSAGES/django.po
- media/pic/default.png 0 additions, 0 deletionsmedia/pic/default.png
- note_kfet/fixtures/initial.json 9 additions, 0 deletionsnote_kfet/fixtures/initial.json
- note_kfet/settings/base.py 22 additions, 4 deletionsnote_kfet/settings/base.py
- note_kfet/settings/development.py 4 additions, 0 deletionsnote_kfet/settings/development.py
- note_kfet/settings/production.py 3 additions, 0 deletionsnote_kfet/settings/production.py
- note_kfet/urls.py 14 additions, 0 deletionsnote_kfet/urls.py
- requirements.txt 2 additions, 0 deletionsrequirements.txt
- static/admin/css/autocomplete.css 260 additions, 0 deletionsstatic/admin/css/autocomplete.css
- static/admin/css/base.css 987 additions, 0 deletionsstatic/admin/css/base.css
- static/admin/css/changelists.css 344 additions, 0 deletionsstatic/admin/css/changelists.css
Loading
Please register or sign in to comment