Merge OpenOLAT default branch to OpenOLAT 13a with 4fc63ba426178381dd2051e558c6e139a8b2579d (85ba1f51) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 85ba1f51 authored 6 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT 13a with 4fc63ba426178381dd2051e558c6e139a8b2579d

parents e50f8e3e c58c0c4d

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/user/DeletedRolesCellRenderer.java 67 additions, 0 deletions

...in/java/org/olat/admin/user/DeletedRolesCellRenderer.java
src/main/java/org/olat/admin/user/DeletedUserDataSource.java 72 additions, 0 deletions

src/main/java/org/olat/admin/user/DeletedUserDataSource.java
src/main/java/org/olat/admin/user/DeletedUsersController.java 159 additions, 0 deletions

...main/java/org/olat/admin/user/DeletedUsersController.java
src/main/java/org/olat/admin/user/DeletedUsersTableModel.java 100 additions, 0 deletions

...main/java/org/olat/admin/user/DeletedUsersTableModel.java
src/main/java/org/olat/admin/user/SystemRolesAndRightsController.java 1 addition, 1 deletion

...a/org/olat/admin/user/SystemRolesAndRightsController.java
src/main/java/org/olat/admin/user/_content/deleted_users.html 1 addition, 0 deletions

...main/java/org/olat/admin/user/_content/deleted_users.html
src/main/java/org/olat/admin/user/_i18n/LocalStrings_de.properties 15 additions, 0 deletions

...java/org/olat/admin/user/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/user/_i18n/LocalStrings_en.properties 14 additions, 0 deletions

...java/org/olat/admin/user/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeManager.java 7 additions, 7 deletions

...org/olat/admin/user/bulkChange/UserBulkChangeManager.java
src/main/java/org/olat/admin/user/delete/ConfirmDeleteUserController.java 2 additions, 0 deletions

...g/olat/admin/user/delete/ConfirmDeleteUserController.java
src/main/java/org/olat/admin/user/delete/DirectDeleteController.java 1 addition, 1 deletion

...va/org/olat/admin/user/delete/DirectDeleteController.java
src/main/java/org/olat/admin/user/delete/ReadyToDeleteController.java 6 additions, 3 deletions

...a/org/olat/admin/user/delete/ReadyToDeleteController.java
src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java 8 additions, 4 deletions

...g/olat/admin/user/delete/service/UserDeletionManager.java
src/main/java/org/olat/basesecurity/BaseSecurity.java 26 additions, 4 deletions

src/main/java/org/olat/basesecurity/BaseSecurity.java
src/main/java/org/olat/basesecurity/BaseSecurityManager.java 87 additions, 1 deletion

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/basesecurity/DeletedIdentitiesQueries.java 41 additions, 0 deletions

.../java/org/olat/basesecurity/DeletedIdentitiesQueries.java
src/main/java/org/olat/basesecurity/IdentityImpl.hbm.xml 7 additions, 8 deletions

src/main/java/org/olat/basesecurity/IdentityImpl.hbm.xml
src/main/java/org/olat/basesecurity/IdentityImpl.java 28 additions, 0 deletions

src/main/java/org/olat/basesecurity/IdentityImpl.java
src/main/java/org/olat/basesecurity/manager/DeletedIdentitiesQueriesImpl.java 130 additions, 0 deletions

...at/basesecurity/manager/DeletedIdentitiesQueriesImpl.java
src/main/java/org/olat/basesecurity/model/DeletedIdentity.java 91 additions, 0 deletions

...ain/java/org/olat/basesecurity/model/DeletedIdentity.java

with 863 additions and 29 deletions

Please register or to comment