Merge branch 'beta' into 'master'
OAuth2, no side effect permissions See merge request !128
Showing
- .gitlab-ci.yml 4 additions, 4 deletions.gitlab-ci.yml
- Dockerfile 2 additions, 2 deletionsDockerfile
- README.md 3 additions, 3 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/templates/member/add_members.html 22 additions, 8 deletionsapps/member/templates/member/add_members.html
- apps/member/views.py 16 additions, 0 deletionsapps/member/views.py
- apps/note/static/note/js/transfer.js 1 addition, 1 deletionapps/note/static/note/js/transfer.js
- apps/permission/fixtures/initial.json 20 additions, 2 deletionsapps/permission/fixtures/initial.json
- apps/permission/models.py 3 additions, 0 deletionsapps/permission/models.py
- locale/de/LC_MESSAGES/django.po 246 additions, 225 deletionslocale/de/LC_MESSAGES/django.po
- locale/es/LC_MESSAGES/django.po 246 additions, 228 deletionslocale/es/LC_MESSAGES/django.po
- locale/fr/LC_MESSAGES/django.po 244 additions, 226 deletionslocale/fr/LC_MESSAGES/django.po
- note.cron 2 additions, 0 deletionsnote.cron
- note_kfet/admin.py 8 additions, 6 deletionsnote_kfet/admin.py
- note_kfet/fixtures/cas.json 0 additions, 11 deletionsnote_kfet/fixtures/cas.json
- note_kfet/fixtures/initial.json 1 addition, 1 deletionnote_kfet/fixtures/initial.json
- note_kfet/settings/__init__.py 0 additions, 7 deletionsnote_kfet/settings/__init__.py
- note_kfet/settings/base.py 12 additions, 0 deletionsnote_kfet/settings/base.py
- note_kfet/settings/development.py 8 additions, 0 deletionsnote_kfet/settings/development.py
Loading
Please register or sign in to comment