Merge branch 'master' into 376-prevent-deep-linking-to-media-files
Showing
- Dockerfile 2 additions, 1 deletionDockerfile
- aleksis/core/forms.py 7 additions, 7 deletionsaleksis/core/forms.py
- aleksis/core/migrations/0001_initial.py 16 additions, 16 deletionsaleksis/core/migrations/0001_initial.py
- aleksis/core/migrations/0002_school_term.py 1 addition, 1 deletionaleksis/core/migrations/0002_school_term.py
- aleksis/core/migrations/0007_dashboard_widget_order.py 1 addition, 1 deletionaleksis/core/migrations/0007_dashboard_widget_order.py
- aleksis/core/migrations/0008_data_check_result.py 1 addition, 1 deletionaleksis/core/migrations/0008_data_check_result.py
- aleksis/core/migrations/0013_pdf_file.py 1 addition, 1 deletionaleksis/core/migrations/0013_pdf_file.py
- aleksis/core/migrations/0015_oauth_permissions.py 1 addition, 1 deletionaleksis/core/migrations/0015_oauth_permissions.py
- aleksis/core/migrations/0016_taskuserassignment.py 36 additions, 0 deletionsaleksis/core/migrations/0016_taskuserassignment.py
- aleksis/core/mixins.py 6 additions, 6 deletionsaleksis/core/mixins.py
- aleksis/core/models.py 25 additions, 2 deletionsaleksis/core/models.py
- aleksis/core/settings.py 1 addition, 1 deletionaleksis/core/settings.py
- aleksis/core/static/js/progress.js 1 addition, 1 deletionaleksis/core/static/js/progress.js
- aleksis/core/static/style.scss 5 additions, 0 deletionsaleksis/core/static/style.scss
- aleksis/core/templates/material/fields/ckeditor_ckeditorwidget.html 28 additions, 0 deletions...re/templates/material/fields/ckeditor_ckeditorwidget.html
- aleksis/core/tests/models/test_group_sync.py 62 additions, 0 deletionsaleksis/core/tests/models/test_group_sync.py
- aleksis/core/urls.py 1 addition, 1 deletionaleksis/core/urls.py
- aleksis/core/util/apps.py 6 additions, 4 deletionsaleksis/core/util/apps.py
- aleksis/core/util/celery_progress.py 73 additions, 12 deletionsaleksis/core/util/celery_progress.py
- aleksis/core/util/core_helpers.py 1 addition, 7 deletionsaleksis/core/util/core_helpers.py
Loading
Please register or sign in to comment