Merge branch 'beta' into JS_translations
# Conflicts: # apps/note/static/note/js/consos.js # locale/de/LC_MESSAGES/django.po # locale/es/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 4 additions, 4 deletions.gitlab-ci.yml
- Dockerfile 2 additions, 2 deletionsDockerfile
- README.md 4 additions, 4 deletionsREADME.md
- ansible/roles/1-apt-basic/tasks/main.yml 5 additions, 1 deletionansible/roles/1-apt-basic/tasks/main.yml
- apps/activity/views.py 4 additions, 0 deletionsapps/activity/views.py
- 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/migrations/0006_create_note_account_bde_membership.py 50 additions, 0 deletions...ber/migrations/0006_create_note_account_bde_membership.py
- apps/member/tables.py 17 additions, 1 deletionapps/member/tables.py
- apps/member/templates/member/includes/profile_info.html 16 additions, 14 deletionsapps/member/templates/member/includes/profile_info.html
- apps/member/templates/member/user_list.html 1 addition, 1 deletionapps/member/templates/member/user_list.html
- 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/tests/test_memberships.py 4 additions, 4 deletionsapps/member/tests/test_memberships.py
- apps/member/views.py 43 additions, 17 deletionsapps/member/views.py
- apps/note/apps.py 10 additions, 1 deletionapps/note/apps.py
- apps/note/models/notes.py 0 additions, 28 deletionsapps/note/models/notes.py
- apps/note/models/transactions.py 3 additions, 0 deletionsapps/note/models/transactions.py
- apps/note/signals.py 12 additions, 0 deletionsapps/note/signals.py
Loading
Please register or sign in to comment