Merge branch 'logout_dropdown_fix' of...

Merge branch 'logout_dropdown_fix' of sharing-codeability.uibk.ac.at:sharing/codeability-sharing-platform into logout_dropdown_fix

src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts

@@ -2,8 +2,10 @@ import { HttpResponse } from '@angular/common/http';
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { Router } from '@angular/router';
 import { faFolder } from '@fortawesome/free-solid-svg-icons';
-import { AccountService } from 'app/core/auth/account.service';
+import { ApplicationInfoService } from 'app/core/application/applicationInfo.service';
 import { Account } from 'app/core/auth/account.model';
+import { AccountService } from 'app/core/auth/account.service';
+import { AlertService } from 'app/core/util/alert.service';
 import { LikesService } from 'app/entities/likes/likes.service';
 import { ExerciseService } from 'app/exercise/service/exercise.service';
 import { SearchService } from 'app/search/service/search-service';
@@ -13,9 +15,7 @@ import { Person } from 'app/shared/model/person.model';
 import { PluginActionInfo } from 'app/shared/model/search/search-result-dto.model';
 import { PluginService } from 'app/shared/service/plugin-service';
 import { WatchlistManager } from 'app/shared/watchlist/watchlist-manager';
-import { AlertService } from 'app/core/util/alert.service';
 import { Subscription } from 'rxjs';
-import { ApplicationInfoService } from 'app/core/application/applicationInfo.service';
 
 @Component({
   selector: 'jhi-exercise-details',
@@ -27,7 +27,6 @@ export class ExerciseDetailsComponent implements OnInit, OnDestroy {
   @Output() exerciseChangedEvent = new EventEmitter<Exercise>();
 
   markDownExercise: Exercise | undefined;
-  actions = ['export to artemis', 'test', 'test2'];
   account: Account | null = null;
   authSubscription?: Subscription;
   hasLiked: Boolean | null = null;
@@ -140,7 +139,10 @@ export class ExerciseDetailsComponent implements OnInit, OnDestroy {
     const recursion = this.downloadWithChildren ? 'WITH_DESCENDANTS' : 'JUST_PROJECT';
     return this.searchService.exportProject(exerciseId, recursion).subscribe(
       (response: HttpResponse<Blob>) => {
-        this.jhiAlertService.addAlert({ type: 'success', translationKey: 'artemisApp.programmingExercise.export.successMessage' });
+        this.jhiAlertService.addAlert({
+          type: 'success',
+          translationKey: 'artemisApp.programmingExercise.export.successMessage',
+        });
         // success('artemisApp.programmingExercise.export.successMessage');
         if (response.body) {
           const zipFile = new Blob([response.body], { type: 'application/zip' });

src/main/webapp/i18n/de/oauth2.json

@@ -2,7 +2,7 @@
   "oauth2": {
     "gitlabOidc": {
       "icon": "/content/img/gitLab.png",
-      "text": "Mit gitLab anmelden"
+      "text": "Mit GitLab anmelden"
     }
   }
 }

src/main/webapp/i18n/en/oauth2.json

@@ -2,7 +2,7 @@
   "oauth2": {
     "gitlabOidc": {
       "icon": "/content/img/gitLab.png",
-      "text": "Login with gitLab"
+      "text": "Login with GitLab"
     }
   }
 }