Merge branch 'beta' into 'master'
Various fixes See merge request !133
No related branches found
No related tags found
Showing
- README.md 1 addition, 1 deletionREADME.md
- apps/member/forms.py 1 addition, 0 deletionsapps/member/forms.py
- apps/member/migrations/0003_create_bde_and_kfet.py 14 additions, 0 deletionsapps/member/migrations/0003_create_bde_and_kfet.py
- apps/member/templatetags/__init__.py 0 additions, 0 deletionsapps/member/templatetags/__init__.py
- apps/member/templatetags/memberinfo.py 22 additions, 0 deletionsapps/member/templatetags/memberinfo.py
- apps/member/tests/test_login.py 1 addition, 1 deletionapps/member/tests/test_login.py
- apps/member/views.py 10 additions, 2 deletionsapps/member/views.py
- apps/note/static/note/js/transfer.js 6 additions, 2 deletionsapps/note/static/note/js/transfer.js
- apps/permission/fixtures/initial.json 20 additions, 2 deletionsapps/permission/fixtures/initial.json
- apps/registration/forms.py 9 additions, 0 deletionsapps/registration/forms.py
- apps/registration/templates/registration/future_profile_detail.html 8 additions, 1 deletion...tration/templates/registration/future_profile_detail.html
- apps/registration/views.py 20 additions, 1 deletionapps/registration/views.py
- apps/treasury/models.py 6 additions, 1 deletionapps/treasury/models.py
- apps/treasury/templates/treasury/sogecredit_list.html 1 addition, 1 deletionapps/treasury/templates/treasury/sogecredit_list.html
- apps/treasury/views.py 1 addition, 1 deletionapps/treasury/views.py
- locale/de/LC_MESSAGES/django.po 180 additions, 142 deletionslocale/de/LC_MESSAGES/django.po
- locale/es/LC_MESSAGES/django.po 179 additions, 141 deletionslocale/es/LC_MESSAGES/django.po
- locale/fr/LC_MESSAGES/django.po 190 additions, 142 deletionslocale/fr/LC_MESSAGES/django.po
- note_kfet/settings/base.py 1 addition, 1 deletionnote_kfet/settings/base.py
- note_kfet/templates/base.html 32 additions, 8 deletionsnote_kfet/templates/base.html
Loading
Please register or sign in to comment