-
- Downloads
Merge branch 'master' into '272-reviewers-should-be-able-to-assign-exercise-groups-to-tutors'
# Conflicts: # core/serializers/tutor.py # core/views/common_views.py # frontend/src/components/tutor_list/TutorList.vue # frontend/src/models.ts
No related branches found
No related tags found
Showing
- core/serializers/tutor.py 3 additions, 1 deletioncore/serializers/tutor.py
- core/tests/test_user_account_views.py 74 additions, 0 deletionscore/tests/test_user_account_views.py
- core/views/common_views.py 28 additions, 0 deletionscore/views/common_views.py
- frontend/src/api.ts 4 additions, 0 deletionsfrontend/src/api.ts
- frontend/src/components/BaseLayout.vue 1 addition, 32 deletionsfrontend/src/components/BaseLayout.vue
- frontend/src/components/TwoPaneLayout.vue 40 additions, 0 deletionsfrontend/src/components/TwoPaneLayout.vue
- frontend/src/components/UserOptions.vue 10 additions, 0 deletionsfrontend/src/components/UserOptions.vue
- frontend/src/components/feedback_labels/LabelSelector.vue 27 additions, 34 deletionsfrontend/src/components/feedback_labels/LabelSelector.vue
- frontend/src/components/feedback_list/FeedbackTable.vue 1 addition, 0 deletionsfrontend/src/components/feedback_list/FeedbackTable.vue
- frontend/src/components/tutor_list/RoleSelect.vue 48 additions, 0 deletionsfrontend/src/components/tutor_list/RoleSelect.vue
- frontend/src/components/tutor_list/TutorList.vue 10 additions, 2 deletionsfrontend/src/components/tutor_list/TutorList.vue
- frontend/src/models.ts 6 additions, 0 deletionsfrontend/src/models.ts
- frontend/src/pages/LayoutSelector.vue 16 additions, 2 deletionsfrontend/src/pages/LayoutSelector.vue
- frontend/src/pages/SubscriptionWorkPage.vue 23 additions, 34 deletionsfrontend/src/pages/SubscriptionWorkPage.vue
- frontend/src/pages/base/FeedbackHistoryPage.vue 17 additions, 27 deletionsfrontend/src/pages/base/FeedbackHistoryPage.vue
- frontend/src/store/modules/ui.ts 0 additions, 6 deletionsfrontend/src/store/modules/ui.ts
Loading
Please register or sign in to comment