diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 424b3e815fbd..8cd968c38187 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -74,14 +74,15 @@ Prerequisites: > [!NOTE] > These badges show the state of the test servers. > Green = Currently available, Red = Currently locked - -![](https://byob.yarr.is/ls1intum/Artemis/artemis-test1) -![](https://byob.yarr.is/ls1intum/Artemis/artemis-test2) -![](https://byob.yarr.is/ls1intum/Artemis/artemis-test3) -![](https://byob.yarr.is/ls1intum/Artemis/artemis-test4) -![](https://byob.yarr.is/ls1intum/Artemis/artemis-test5) -![](https://byob.yarr.is/ls1intum/Artemis/artemis-test6) -![](https://byob.yarr.is/ls1intum/Artemis/artemis-test9) +> Click on the badges to get to the test servers. + +[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test1)](https://artemis-test1.artemis.cit.tum.de) +[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test2)](https://artemis-test2.artemis.cit.tum.de) +[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test3)](https://artemis-test3.artemis.cit.tum.de) +[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test4)](https://artemis-test4.artemis.cit.tum.de) +[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test5)](https://artemis-test5.artemis.cit.tum.de) +[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test6)](https://artemis-test6.artemis.cit.tum.de) +[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test9)](https://artemis-test9.artemis.cit.tum.de) ### Review Progress diff --git a/build.gradle b/build.gradle index 6d3486ef69aa..d75fa6cb9c87 100644 --- a/build.gradle +++ b/build.gradle @@ -228,7 +228,7 @@ dependencies { // Note: jenkins-client is not well maintained and includes dependencies to libraries with critical security issues (e.g. CVE-2020-10683 for dom4j@1.6.1) // implementation "com.offbytwo.jenkins:jenkins-client:0.3.8" - implementation files("libs/jenkins-client-0.4.0.jar") + implementation files("libs/jenkins-client-0.4.1.jar") // The following 4 dependencies are explicitly integrated as transitive dependencies of jenkins-client-0.4.0.jar implementation "org.apache.httpcomponents.client5:httpclient5:5.3.1" implementation "org.apache.httpcomponents.core5:httpcore5:5.2.4" @@ -268,7 +268,7 @@ dependencies { // Note: spring-security-lti13 does not work with jakarta yet, so we built our own custom version and declare its transitive dependencies below // implementation "uk.ac.ox.ctl:spring-security-lti13:0.1.11" - implementation files("libs/spring-security-lti13-0.1.12.jar") + implementation files("libs/spring-security-lti13-0.1.13.jar") // https://search.maven.org/artifact/org.eclipse.jgit/org.eclipse.jgit implementation "org.eclipse.jgit:org.eclipse.jgit:${jgit_version}" diff --git a/docs/admin/setup/athena.rst b/docs/admin/setup/athena.rst index 3e1fa64c1eb4..d47053dcae1b 100644 --- a/docs/admin/setup/athena.rst +++ b/docs/admin/setup/athena.rst @@ -25,7 +25,7 @@ HTTP. We need to extend the configuration in the file artemis: # ... athena: - url: http://localhost:5000 + url: http://localhost:5100 secret: abcdef12345 modules: # See https://github.com/ls1intum/Athena for a list of available modules diff --git a/libs/jenkins-client-0.4.0.jar b/libs/jenkins-client-0.4.0.jar deleted file mode 100644 index 820adf5f0057..000000000000 Binary files a/libs/jenkins-client-0.4.0.jar and /dev/null differ diff --git a/libs/jenkins-client-0.4.1.jar b/libs/jenkins-client-0.4.1.jar new file mode 100644 index 000000000000..51d84492baf2 Binary files /dev/null and b/libs/jenkins-client-0.4.1.jar differ diff --git a/libs/spring-security-lti13-0.1.12.jar b/libs/spring-security-lti13-0.1.12.jar deleted file mode 100644 index 78de5c569751..000000000000 Binary files a/libs/spring-security-lti13-0.1.12.jar and /dev/null differ diff --git a/libs/spring-security-lti13-0.1.13.jar b/libs/spring-security-lti13-0.1.13.jar new file mode 100644 index 000000000000..fc86bfd877d7 Binary files /dev/null and b/libs/spring-security-lti13-0.1.13.jar differ diff --git a/src/main/resources/config/application-artemis.yml b/src/main/resources/config/application-artemis.yml index 5bc88c5b1056..4b095afb3bee 100644 --- a/src/main/resources/config/application-artemis.yml +++ b/src/main/resources/config/application-artemis.yml @@ -95,7 +95,7 @@ artemis: name: Artemis email: artemis@xcit.tum.de athena: - url: http://localhost:5000 + url: http://localhost:5100 secret: abcdef12345 restricted-modules: module_text_llm,module_programming_llm apollon: diff --git a/src/main/webapp/app/course/competencies/competency-accordion/competency-accordion.component.html b/src/main/webapp/app/course/competencies/competency-accordion/competency-accordion.component.html index 9c5e85a854a9..d1b997bd2c08 100644 --- a/src/main/webapp/app/course/competencies/competency-accordion/competency-accordion.component.html +++ b/src/main/webapp/app/course/competencies/competency-accordion/competency-accordion.component.html @@ -6,12 +6,14 @@ (click)="toggle()" >

- + @if (competency.taxonomy) { + + } {{ competency.title }}

diff --git a/src/main/webapp/app/entities/student-metrics.model.ts b/src/main/webapp/app/entities/student-metrics.model.ts index 00d18bca204d..4ad4dc6a5caf 100644 --- a/src/main/webapp/app/entities/student-metrics.model.ts +++ b/src/main/webapp/app/entities/student-metrics.model.ts @@ -71,7 +71,7 @@ export class CompetencyInformation { public id: number; public title: string; public description: string; - public taxonomy: CompetencyTaxonomy; + public taxonomy?: CompetencyTaxonomy; public softDueDate?: dayjs.Dayjs; public optional: boolean; public masteryThreshold: number; diff --git a/src/main/webapp/i18n/de/global.json b/src/main/webapp/i18n/de/global.json index 536ecc7583fc..2271ca1897c0 100644 --- a/src/main/webapp/i18n/de/global.json +++ b/src/main/webapp/i18n/de/global.json @@ -251,7 +251,7 @@ "viewResult": "Ergebnis anzeigen", "cleanupBuildPlan": "Build-Plan aufräumen", "exercise": "Aufgaben", - "scores": "Bewertungen", + "scores": "Punkte", "exams": "Klausuren", "hints": "Hinweise", "addExternalSubmission": "Externe Einreichung anlegen", diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java index 71d2206c52c4..604ed22c0ee5 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java @@ -65,13 +65,13 @@ class ProgrammingExerciseLocalVCLocalCIIntegrationTest extends AbstractSpringInt private ProgrammingExercise programmingExercise; - LocalRepository templateRepository; + private LocalRepository templateRepository; - LocalRepository solutionRepository; + private LocalRepository solutionRepository; - LocalRepository testsRepository; + private LocalRepository testsRepository; - LocalRepository assignmentRepository; + private LocalRepository assignmentRepository; @Value("${artemis.user-management.internal-admin.username}") private String localVCUsername; diff --git a/src/test/resources/config/application-artemis.yml b/src/test/resources/config/application-artemis.yml index 406348ef1702..1bc086c96a92 100644 --- a/src/test/resources/config/application-artemis.yml +++ b/src/test/resources/config/application-artemis.yml @@ -57,7 +57,7 @@ artemis: name: Artemis email: artemis@in.tum.de athena: - url: http://localhost:5000 + url: http://localhost:5100 secret: abcdef12345 restricted-modules: module_text_test_restricted,module_programming_test_restricted apollon: