Merge branch 'master' into 'development'
Merge Master Bugfix back to Development See merge request sharing/codeability-sharing-platform!194
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- src/main/java/at/ac/uibk/gitsearch/service/AuthorityService.java 4 additions, 3 deletions...n/java/at/ac/uibk/gitsearch/service/AuthorityService.java
- src/main/java/at/ac/uibk/gitsearch/service/MailService.java 1 addition, 1 deletionsrc/main/java/at/ac/uibk/gitsearch/service/MailService.java
- src/main/java/at/ac/uibk/gitsearch/service/ReviewService.java 1 addition, 1 deletion...main/java/at/ac/uibk/gitsearch/service/ReviewService.java
- src/main/resources/.h2.server.properties 1 addition, 1 deletionsrc/main/resources/.h2.server.properties
- src/main/resources/config/application-prod.yml 3 additions, 0 deletionssrc/main/resources/config/application-prod.yml
- src/main/resources/config/application-staging.yml 6 additions, 0 deletionssrc/main/resources/config/application-staging.yml
- src/main/resources/keycloak-theme/themes/gitsearch/login/login.ftl 1 addition, 1 deletion...resources/keycloak-theme/themes/gitsearch/login/login.ftl
- src/main/resources/keycloak-theme/themes/gitsearch/login/messages/messages_de.properties 2 additions, 1 deletion...me/themes/gitsearch/login/messages/messages_de.properties
- src/main/resources/keycloak-theme/themes/gitsearch/login/messages/messages_en.properties 2 additions, 1 deletion...me/themes/gitsearch/login/messages/messages_en.properties
- src/main/webapp/app/layouts/datapolicy/datapolicy.component.html 15 additions, 0 deletions...n/webapp/app/layouts/datapolicy/datapolicy.component.html
- src/main/webapp/i18n/de/oauth2.json 1 addition, 1 deletionsrc/main/webapp/i18n/de/oauth2.json
- src/main/webapp/i18n/en/oauth2.json 1 addition, 1 deletionsrc/main/webapp/i18n/en/oauth2.json
Please register or sign in to comment