Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Stud.IP
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Model registry
- Model experiments

Snippets Groups Projects

c57b2f10

Verified Commit c57b2f10 authored 3 years ago by Till Glöggler

Downloads
- Plain Diff

Merge remote-tracking branch 'studip/5.0' into 5.0

parents aee11bd8 7346be1e

No related branches found

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

app/views/resources/room_request/resolve.php 2 additions, 2 deletions

app/views/resources/room_request/resolve.php
lib/classes/StudipCoreFormat.php 18 additions, 9 deletions

lib/classes/StudipCoreFormat.php
lib/classes/htmlpurifier/HTMLPurifier_Injector_ClassifyLinks.php 5 additions, 3 deletions

...sses/htmlpurifier/HTMLPurifier_Injector_ClassifyLinks.php
resources/vue/components/courseware/CoursewareStructuralElement.vue 36 additions, 105 deletions

...vue/components/courseware/CoursewareStructuralElement.vue
resources/vue/components/courseware/CoursewareTableOfContentsBlock.vue 4 additions, 1 deletion

.../components/courseware/CoursewareTableOfContentsBlock.vue
resources/vue/components/courseware/IndexApp.vue 56 additions, 4 deletions

resources/vue/components/courseware/IndexApp.vue

with 121 additions and 124 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment