Merge branch 'beta' into 'main'
Optional scopes + small bug fix See merge request !193
No related branches found
No related tags found
Showing
- README.md 2 additions, 2 deletionsREADME.md
- ansible/base.yml 1 addition, 1 deletionansible/base.yml
- ansible/host_vars/bde-note.adh.crans.org.yml 1 addition, 1 deletionansible/host_vars/bde-note.adh.crans.org.yml
- ansible/roles/1-apt-basic/tasks/main.yml 4 additions, 3 deletionsansible/roles/1-apt-basic/tasks/main.yml
- apps/api/serializers.py 18 additions, 3 deletionsapps/api/serializers.py
- apps/member/models.py 6 additions, 4 deletionsapps/member/models.py
- apps/permission/scopes.py 24 additions, 1 deletionapps/permission/scopes.py
- apps/permission/templates/permission/scopes.html 11 additions, 12 deletionsapps/permission/templates/permission/scopes.html
- apps/wei/forms/surveys/__init__.py 2 additions, 2 deletionsapps/wei/forms/surveys/__init__.py
- apps/wei/forms/surveys/wei2022.py 293 additions, 0 deletionsapps/wei/forms/surveys/wei2022.py
- apps/wei/tests/test_wei_algorithm_2021.py 1 addition, 0 deletionsapps/wei/tests/test_wei_algorithm_2021.py
- apps/wei/tests/test_wei_algorithm_2022.py 110 additions, 0 deletionsapps/wei/tests/test_wei_algorithm_2022.py
- apps/wei/tests/test_wei_registration.py 1 addition, 1 deletionapps/wei/tests/test_wei_registration.py
- docs/apps/treasury.rst 1 addition, 1 deletiondocs/apps/treasury.rst
- docs/external_services/oauth2.rst 32 additions, 0 deletionsdocs/external_services/oauth2.rst
- docs/install.rst 2 additions, 2 deletionsdocs/install.rst
- note_kfet/settings/base.py 4 additions, 0 deletionsnote_kfet/settings/base.py
Loading
Please register or sign in to comment