Merge branch 'master' of
ssh://aboeckle@office.frentix.com/home/aboeckle/repositories/OpenOLAT.git Conflicts: src/main/resources/database/mysql/alter_15_pre_0_to_15_pre_4.sql src/main/resources/database/oracle/alter_15_pre_0_to_15_pre_4.sql src/main/resources/database/postgresql/alter_15_pre_0_to_15_pre_4.sql src/main/webapp/static/themes/light/theme.css src/main/webapp/static/themes/light/theme.css.map src/main/webapp/static/themes/openolat/theme.css src/main/webapp/static/themes/openolat/theme.css.map
No related branches found
No related tags found
Showing
- src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java 2 additions, 0 deletions...m/flexible/impl/elements/table/FlexiTableElementImpl.java
- src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java 1 addition, 1 deletion...core/gui/control/generic/iframe/IFrameDeliveryMapper.java
- src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java 1 addition, 2 deletions...va/org/olat/course/assessment/ui/tool/AssessmentForm.java
- src/main/java/org/olat/course/condition/GroupSelectionController.java 67 additions, 10 deletions...a/org/olat/course/condition/GroupSelectionController.java
- src/main/java/org/olat/course/condition/_i18n/LocalStrings_de.properties 11 additions, 0 deletions...rg/olat/course/condition/_i18n/LocalStrings_de.properties
- src/main/java/org/olat/course/condition/_i18n/LocalStrings_en.properties 11 additions, 0 deletions...rg/olat/course/condition/_i18n/LocalStrings_en.properties
- src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java 37 additions, 10 deletions...g/olat/course/nodes/en/ENEditGroupAreaFormController.java
- src/main/java/org/olat/course/nodes/en/ENEditGroupTableContentRow.java 63 additions, 3 deletions.../org/olat/course/nodes/en/ENEditGroupTableContentRow.java
- src/main/java/org/olat/course/nodes/en/ENEditGroupTableModel.java 33 additions, 4 deletions.../java/org/olat/course/nodes/en/ENEditGroupTableModel.java
- src/main/java/org/olat/course/nodes/en/_i18n/LocalStrings_de.properties 7 additions, 0 deletions...org/olat/course/nodes/en/_i18n/LocalStrings_de.properties
- src/main/java/org/olat/course/nodes/en/_i18n/LocalStrings_en.properties 10 additions, 0 deletions...org/olat/course/nodes/en/_i18n/LocalStrings_en.properties
- src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java 20 additions, 2 deletions...t/course/nodes/iq/IQIdentityListCourseNodeController.java
- src/main/java/org/olat/course/nodes/iq/QTI21IdentityListCourseNodeToolsController.java 14 additions, 6 deletions.../nodes/iq/QTI21IdentityListCourseNodeToolsController.java
- src/main/java/org/olat/group/manager/BusinessGroupDAO.java 4 additions, 4 deletionssrc/main/java/org/olat/group/manager/BusinessGroupDAO.java
- src/main/java/org/olat/group/model/BusinessGroupQueryParams.java 7 additions, 5 deletions...n/java/org/olat/group/model/BusinessGroupQueryParams.java
- src/main/java/org/olat/group/model/StatisticsBusinessGroupRow.java 4 additions, 4 deletions...java/org/olat/group/model/StatisticsBusinessGroupRow.java
- src/main/java/org/olat/group/ui/main/EditMembershipController.java 3 additions, 1 deletion...java/org/olat/group/ui/main/EditMembershipController.java
- src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java 16 additions, 3 deletions...g/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
- src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionAssessmentItemListController.java 2 additions, 1 deletion...ui/assessment/CorrectionAssessmentItemListController.java
- src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityAssessmentItemListController.java 6 additions, 6 deletions...sment/CorrectionIdentityAssessmentItemListController.java
Loading
Please register or sign in to comment