Merge branch 'OpenOLAT_14.2' of...
Merge branch 'OpenOLAT_14.2' of ssh://uhensler@office.frentix.com/home/uhensler/repositories/OpenOLAT.git Conflicts: src/main/webapp/static/themes/light/content.css.map src/main/webapp/static/themes/light/email.css.map src/main/webapp/static/themes/openolat/content.css.map src/main/webapp/static/themes/openolat/email.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
- .gitignore 2 additions, 0 deletions.gitignore
- src/main/java/org/olat/modules/fo/ui/MessageEditController.java 2 additions, 0 deletions...in/java/org/olat/modules/fo/ui/MessageEditController.java
- src/main/java/org/olat/modules/lecture/manager/LectureBlockReminderDAO.java 2 additions, 0 deletions...olat/modules/lecture/manager/LectureBlockReminderDAO.java
- src/main/java/org/olat/modules/lecture/manager/LectureServiceImpl.java 5 additions, 3 deletions.../org/olat/modules/lecture/manager/LectureServiceImpl.java
- src/main/java/org/olat/search/service/indexer/group/GroupIndexer.java 15 additions, 9 deletions...a/org/olat/search/service/indexer/group/GroupIndexer.java
- src/main/webapp/static/themes/compiletheme.sh 1 addition, 1 deletionsrc/main/webapp/static/themes/compiletheme.sh
- src/main/webapp/static/themes/light/content.css 1 addition, 2 deletionssrc/main/webapp/static/themes/light/content.css
- src/main/webapp/static/themes/light/content.css.map 1 addition, 7 deletionssrc/main/webapp/static/themes/light/content.css.map
- src/main/webapp/static/themes/light/email.css 1 addition, 2 deletionssrc/main/webapp/static/themes/light/email.css
- src/main/webapp/static/themes/light/email.css.map 1 addition, 7 deletionssrc/main/webapp/static/themes/light/email.css.map
- src/main/webapp/static/themes/light/theme.css 1 addition, 2 deletionssrc/main/webapp/static/themes/light/theme.css
- src/main/webapp/static/themes/light/theme.css.map 1 addition, 7 deletionssrc/main/webapp/static/themes/light/theme.css.map
- src/main/webapp/static/themes/openolat/content.css 2 additions, 3 deletionssrc/main/webapp/static/themes/openolat/content.css
- src/main/webapp/static/themes/openolat/content.css.map 1 addition, 7 deletionssrc/main/webapp/static/themes/openolat/content.css.map
- src/main/webapp/static/themes/openolat/email.css 1 addition, 2 deletionssrc/main/webapp/static/themes/openolat/email.css
- src/main/webapp/static/themes/openolat/email.css.map 1 addition, 7 deletionssrc/main/webapp/static/themes/openolat/email.css.map
- src/main/webapp/static/themes/openolat/theme.css 2 additions, 3 deletionssrc/main/webapp/static/themes/openolat/theme.css
- src/main/webapp/static/themes/openolat/theme.css.map 1 addition, 7 deletionssrc/main/webapp/static/themes/openolat/theme.css.map
- src/main/webapp/static/themes/themes.README 3 additions, 0 deletionssrc/main/webapp/static/themes/themes.README
- src/test/java/org/olat/modules/lecture/manager/LectureBlockReminderDAOTest.java 39 additions, 0 deletions.../modules/lecture/manager/LectureBlockReminderDAOTest.java
Loading
Please register or sign in to comment