Merge branch 'development' into 'master'
merge development into master See merge request !266
Showing
- .gitlab-ci.yml 1 addition, 1 deletion.gitlab-ci.yml
- .husky/pre-commit 1 addition, 1 deletion.husky/pre-commit
- .prettierrc 9 additions, 18 deletions.prettierrc
- .settings/org.eclipse.core.resources.prefs 1 addition, 0 deletions.settings/org.eclipse.core.resources.prefs
- Screenshot from 2024-04-22 20-07-48.png 0 additions, 0 deletionsScreenshot from 2024-04-22 20-07-48.png
- angular.json 10 additions, 2 deletionsangular.json
- manual_deploy.sh 2 additions, 1 deletionmanual_deploy.sh
- package.json 2 additions, 2 deletionspackage.json
- pom.xml 18 additions, 1 deletionpom.xml
- src/main/docker/gitsearch.yml 2 additions, 49 deletionssrc/main/docker/gitsearch.yml
- src/main/docker/keycloak.yml 0 additions, 36 deletionssrc/main/docker/keycloak.yml
- src/main/java/at/ac/uibk/gitsearch/ApplicationWebXml.java 6 additions, 6 deletionssrc/main/java/at/ac/uibk/gitsearch/ApplicationWebXml.java
- src/main/java/at/ac/uibk/gitsearch/GitsearchApp.java 68 additions, 71 deletionssrc/main/java/at/ac/uibk/gitsearch/GitsearchApp.java
- src/main/java/at/ac/uibk/gitsearch/aop/logging/LoggingAspect.java 79 additions, 83 deletions.../java/at/ac/uibk/gitsearch/aop/logging/LoggingAspect.java
- src/main/java/at/ac/uibk/gitsearch/config/AsyncConfiguration.java 20 additions, 20 deletions.../java/at/ac/uibk/gitsearch/config/AsyncConfiguration.java
- src/main/java/at/ac/uibk/gitsearch/config/CacheConfiguration.java 67 additions, 67 deletions.../java/at/ac/uibk/gitsearch/config/CacheConfiguration.java
- src/main/java/at/ac/uibk/gitsearch/config/Constants.java 6 additions, 6 deletionssrc/main/java/at/ac/uibk/gitsearch/config/Constants.java
- src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java 36 additions, 36 deletions...va/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java
- src/main/java/at/ac/uibk/gitsearch/config/DateTimeFormatConfiguration.java 6 additions, 6 deletions...ac/uibk/gitsearch/config/DateTimeFormatConfiguration.java
- src/main/java/at/ac/uibk/gitsearch/config/EduSharingApiConfiguration.java 104 additions, 0 deletions.../ac/uibk/gitsearch/config/EduSharingApiConfiguration.java
Please register or sign in to comment