Merge remote-tracking branch 'origin/master' into cas
Showing
- README.md 3 additions, 3 deletionsREADME.md
- apps/member/forms.py 5 additions, 0 deletionsapps/member/forms.py
- apps/member/hashers.py 27 additions, 0 deletionsapps/member/hashers.py
- apps/member/views.py 4 additions, 3 deletionsapps/member/views.py
- apps/note/admin.py 11 additions, 9 deletionsapps/note/admin.py
- apps/note/fixtures/initial.json 9 additions, 9 deletionsapps/note/fixtures/initial.json
- apps/note/forms.py 5 additions, 6 deletionsapps/note/forms.py
- apps/note/models/__init__.py 3 additions, 2 deletionsapps/note/models/__init__.py
- apps/note/models/notes.py 19 additions, 8 deletionsapps/note/models/notes.py
- apps/note/models/transactions.py 29 additions, 8 deletionsapps/note/models/transactions.py
- apps/note/views.py 5 additions, 4 deletionsapps/note/views.py
- note_kfet/settings/base.py 6 additions, 0 deletionsnote_kfet/settings/base.py
- templates/base.html 3 additions, 3 deletionstemplates/base.html
- templates/member/profile_detail.html 8 additions, 8 deletionstemplates/member/profile_detail.html
- templates/member/signup.html 1 addition, 1 deletiontemplates/member/signup.html
- templates/note/conso_form.html 7 additions, 7 deletionstemplates/note/conso_form.html
Loading
Please register or sign in to comment