Skip to content
Snippets Groups Projects
Commit 9c4305f3 authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel
Browse files

Merge branch 'staging' into 'master'

"create question" and "statistics" commented out for EDULEARN19

See merge request arsnova/arsnova-lite!249
parents 677aaa46 1cfaa97f
1 merge request!249"create question" and "statistics" commented out for EDULEARN19
Pipeline #27427 passed with stages
in 6 minutes and 37 seconds
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
</button> </button>
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
<!-- commented out for EDULEARN19
<mat-grid-list cols="2" rowHeight="2:1"> <mat-grid-list cols="2" rowHeight="2:1">
<mat-grid-tile> <mat-grid-tile>
<button mat-icon-button <button mat-icon-button
...@@ -61,6 +62,7 @@ ...@@ -61,6 +62,7 @@
</button> </button>
</mat-grid-tile> </mat-grid-tile>
</mat-grid-list> </mat-grid-list>
-->
<app-content-groups *ngIf="room && room.contentGroups" [contentGroups]="room.contentGroups"></app-content-groups> <app-content-groups *ngIf="room && room.contentGroups" [contentGroups]="room.contentGroups"></app-content-groups>
</mat-card> </mat-card>
<div *ngIf="!isLoading && !room">Error: room could not be found!</div> <div *ngIf="!isLoading && !room">Error: room could not be found!</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment