Merge remote-tracking branch 'origin/OpenOLAT_15.2' (0045f96a) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 0045f96a authored 4 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_15.2'

parents cb9e3131 a492b89f

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/security/_i18n/LocalStrings_en.properties 3 additions, 2 deletions

.../org/olat/admin/security/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/user/UserSearchController.java 7 additions, 5 deletions

src/main/java/org/olat/admin/user/UserSearchController.java
src/main/java/org/olat/admin/user/UserSearchForm.java 7 additions, 3 deletions

src/main/java/org/olat/admin/user/UserSearchForm.java
src/main/java/org/olat/admin/user/_i18n/LocalStrings_en.properties 2 additions, 1 deletion

...java/org/olat/admin/user/_i18n/LocalStrings_en.properties
src/main/java/org/olat/basesecurity/manager/AuthenticationDAO.java 10 additions, 10 deletions

...java/org/olat/basesecurity/manager/AuthenticationDAO.java
src/main/java/org/olat/basesecurity/model/IdentityLastLoginImpl.java 5 additions, 1 deletion

...va/org/olat/basesecurity/model/IdentityLastLoginImpl.java
src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_en.properties 14 additions, 12 deletions

...rg/olat/course/config/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_en.properties 4 additions, 329 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/en/_i18n/LocalStrings_en.properties 10 additions, 25 deletions

...org/olat/course/nodes/en/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/fo/_i18n/LocalStrings_en.properties 2 additions, 1 deletion

...org/olat/course/nodes/fo/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_en.properties 8 additions, 8 deletions

...org/olat/course/nodes/ms/_i18n/LocalStrings_en.properties
src/main/java/org/olat/home/UserSearchAndInfoController.java 0 additions, 6 deletions

src/main/java/org/olat/home/UserSearchAndInfoController.java
src/main/java/org/olat/ims/qti/editor/_i18n/LocalStrings_en.properties 14 additions, 40 deletions

.../org/olat/ims/qti/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/report/_i18n/LocalStrings_en.properties 12 additions, 13 deletions

...olat/ims/qti21/ui/report/_i18n/LocalStrings_en.properties
src/main/java/org/olat/repository/manager/RepositoryEntryStatisticsDAO.java 5 additions, 3 deletions

...olat/repository/manager/RepositoryEntryStatisticsDAO.java
src/main/java/org/olat/repository/ui/admin/_i18n/LocalStrings_fr.properties 8 additions, 1 deletion

...olat/repository/ui/admin/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/repository/ui/catalog/_i18n/LocalStrings_en.properties 11 additions, 10 deletions

...at/repository/ui/catalog/_i18n/LocalStrings_en.properties
src/main/java/org/olat/repository/ui/catalog/_i18n/LocalStrings_fr.properties 9 additions, 1 deletion

...at/repository/ui/catalog/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/search/service/document/IdentityDocument.java 8 additions, 4 deletions

...va/org/olat/search/service/document/IdentityDocument.java
src/main/java/org/olat/user/HomePageDisplayController.java 5 additions, 1 deletion

src/main/java/org/olat/user/HomePageDisplayController.java

with 144 additions and 476 deletions

Please register or to comment