Merge remote-tracking branch 'origin/OpenOLAT_15.1.uibk' (79587b7d) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 79587b7d authored 4 years ago by Andreas Parschalk

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_15.1.uibk'

parents bf97223b 095ab03d

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
pom.xml 11 additions, 10 deletions

pom.xml
src/main/java/at/ac/uibk/course/CreateCourseRepositoryEntryController.java 0 additions, 12 deletions

...ac/uibk/course/CreateCourseRepositoryEntryController.java
src/main/java/de/bps/course/nodewizard/CopyStructureWizardStepRunnerCallback.java 4 additions, 0 deletions

...rse/nodewizard/CopyStructureWizardStepRunnerCallback.java
src/main/java/de/bps/course/nodewizard/coursenode/AbstractCourseNodeCopyConfigurator.java 9 additions, 0 deletions

...wizard/coursenode/AbstractCourseNodeCopyConfigurator.java
src/main/java/de/bps/course/nodewizard/coursenode/BCCourseNodeCopyConfigurator.java 6 additions, 0 deletions

...e/nodewizard/coursenode/BCCourseNodeCopyConfigurator.java
src/main/java/de/bps/course/nodewizard/coursenode/DialogCourseNodeCopyConfigurator.java 5 additions, 0 deletions

...dewizard/coursenode/DialogCourseNodeCopyConfigurator.java
src/main/java/de/bps/course/nodewizard/coursenode/FOCourseNodeCopyConfigurator.java 6 additions, 0 deletions

...e/nodewizard/coursenode/FOCourseNodeCopyConfigurator.java
src/main/java/de/bps/course/nodewizard/coursenode/ICourseNodeCopyConfigurator.java 1 addition, 0 deletions

...se/nodewizard/coursenode/ICourseNodeCopyConfigurator.java
src/main/java/de/bps/course/nodewizard/coursenode/InfoCourseNodeCopyConfigurator.java 5 additions, 0 deletions

...nodewizard/coursenode/InfoCourseNodeCopyConfigurator.java
src/main/java/de/bps/course/nodewizard/coursenode/WikiCourseNodeCopyConfigurator.java 6 additions, 0 deletions

...nodewizard/coursenode/WikiCourseNodeCopyConfigurator.java
src/main/java/org/olat/admin/AdminModuleDispatcher.java 15 additions, 21 deletions

src/main/java/org/olat/admin/AdminModuleDispatcher.java
src/main/java/org/olat/admin/user/UsermanagerUserSearchController.java 12 additions, 7 deletions

.../org/olat/admin/user/UsermanagerUserSearchController.java
src/main/java/org/olat/admin/user/UsermanagerUserSearchForm.java 1 addition, 1 deletion

...n/java/org/olat/admin/user/UsermanagerUserSearchForm.java
src/main/java/org/olat/core/commons/services/jmx/_spring/jmxContext.xml 0 additions, 4 deletions

...org/olat/core/commons/services/jmx/_spring/jmxContext.xml
src/main/java/org/olat/core/commons/services/license/manager/ResourceLicenseDAO.java 12 additions, 2 deletions

.../commons/services/license/manager/ResourceLicenseDAO.java
src/main/java/org/olat/core/commons/services/taskexecutor/_spring/taskExecutorCorecontext.xml 1 addition, 1 deletion

...services/taskexecutor/_spring/taskExecutorCorecontext.xml
src/main/java/org/olat/core/commons/services/taskexecutor/manager/TaskExecutorManagerImpl.java 4 additions, 2 deletions

...ervices/taskexecutor/manager/TaskExecutorManagerImpl.java
src/main/java/org/olat/core/gui/components/link/LinkRenderer.java 6 additions, 4 deletions

.../java/org/olat/core/gui/components/link/LinkRenderer.java
src/main/java/org/olat/core/gui/exception/ExceptionWindowController.java 0 additions, 1 deletion

...rg/olat/core/gui/exception/ExceptionWindowController.java

with 105 additions and 66 deletions

Please register or to comment