Commits · b69d49b846605af9262ed03b7bdce47f9805d7ff · Lars Oliver Dam / OLAT CI-CD Testing Project

Oct 22, 2019
- Merge branch 'master' into learning_path · b69d49b8
  uhensler authored 5 years ago
  
  Conflicts: 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
  b69d49b8
- OO-4315, OO-4207: Course navigation buttons, course node confirmation button, save confirmation · bb45fd8f
  uhensler authored 5 years ago
  
  bb45fd8f
- Merge remote-tracking branch 'origin/OpenOLAT_14.1' · 9fbd44d5
  srosse authored 5 years ago
  
  9fbd44d5
- OO-4313: fix rs in absence wizard because of disposed listener · daa3ded2
  srosse authored 5 years ago
  
  daa3ded2
Oct 21, 2019
- Merge branch 'OpenOLAT_14.1' · daaf38b1
  uhensler authored 5 years ago
  
  daaf38b1
- OO-4312: Show full document editor in Safari on iOS devices · e24f6062
  uhensler authored 5 years ago
  
  e24f6062
Oct 19, 2019
- Merge remote-tracking branch 'origin/OpenOLAT_14.1' · 12152525
  srosse authored 5 years ago
  
  12152525
- Merge remote-tracking branch 'origin/OpenOLAT_14.0' into OpenOLAT_14.1 · a94f7448
  srosse authored 5 years ago
  
  a94f7448
- Merge branch 'OpenOLAT_14.0' of... · 2caa0ef6
  srosse authored 5 years ago
  
  Merge branch 'OpenOLAT_14.0' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git into OpenOLAT_14.0
  2caa0ef6
- OO-4310: make sure the deleted metadata are really deleted · 3dfb2052
  srosse authored 5 years ago
  
  3dfb2052
Oct 18, 2019
- OO-4310: make sure the deleted metadata are really deleted · fbb0ee0e
  srosse authored 5 years ago
  
  fbb0ee0e
- OO-4303: responsive by javascript for nanoo.tv · b8c27d8a
  srosse authored 5 years ago
  
  b8c27d8a
- OO-4311: hint for downloadable types in blog/podcast · 36a1cdad
  srosse authored 5 years ago
  
  36a1cdad
- no-jira: add the replace keyword in the refresh sql · a431a291
  srosse authored 5 years ago
  
  a431a291
Oct 16, 2019
- Merge remote-tracking branch 'origin/OpenOLAT_14.1' · a57a6273
  srosse authored 5 years ago
  
  a57a6273
- OO-4307: delete assessment mode with lecture block if linked · 9e30a974
  srosse authored 5 years ago
  
  9e30a974
- OO-4304: fix filter short cuts only tools for not configured instances · bbac3de1
  srosse authored 5 years ago
  
  bbac3de1
- Merge remote-tracking branch 'origin/OpenOLAT_14.1' · bcfd6ad7
  srosse authored 5 years ago
  
  bcfd6ad7
- Merge branch 'OpenOLAT_14.1' of... · 6ac9c11b
  srosse authored 5 years ago
  
  Merge branch 'OpenOLAT_14.1' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git into OpenOLAT_14.1
  6ac9c11b
- no-jira: changes to LTI selenium test · c5924ded
  srosse authored 5 years ago
  
  c5924ded
- OO-4308: increase default user name max. length to 64 · fb76d6e8
  srosse authored 5 years ago
  
  fb76d6e8
- no-jira: update refresh view for MySQL · 44c77397
  srosse authored 5 years ago
  
  44c77397
- OO-4297 add enum options for managed flags in models · 9711077a
  Moritzjenny authored 5 years ago
  
  9711077a
- OO-4306: use the session id to session cache for Windows Client too · 7e7c15a0
  srosse authored 5 years ago
  
  7e7c15a0
Oct 15, 2019
- Merge remote-tracking branch 'origin/OpenOLAT_14.1' · c1205df0
  srosse authored 5 years ago
  
  c1205df0
- OO-4296: adapt drawing interaction to android devices · a7531943
  srosse authored 5 years ago
  
  a7531943
Oct 14, 2019
- Merge remote-tracking branch 'origin/OpenOLAT_14.1' · 2bea8d3e
  srosse authored 5 years ago
  
  2bea8d3e
- no-jira: try to fix selenium test for LTI course element · c4ef737c
  srosse authored 5 years ago
  
  c4ef737c
- OO-4292: better permission check to create group in course · 4296228d
  srosse authored 5 years ago
  
  4296228d
- OO-4294: fix sort by title in the learn resource picker · 5d556ecb
  srosse authored 5 years ago
  
  5d556ecb
- OO-4305: don't fallback in folder peek view if metadata are migrated · 969d5129
  srosse authored 5 years ago
  
  969d5129
Oct 10, 2019

Merge branch 'OpenOLAT_14.1' · d6871c9a
Moritzjenny authored 5 years ago

d6871c9a
no-jira: Links to user manual · 24c629fc
Moritzjenny authored 5 years ago

24c629fc
no-jira: Links to user manual · e971da2b
Moritzjenny authored 5 years ago

e971da2b
OO-4186: Delete unused translations · 3ab58cd8
uhensler authored 5 years ago

3ab58cd8

Merge branch 'master' into learning_path · d70e8bd1

uhensler authored 5 years ago

Conflicts:
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_ar.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_bg.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_cs.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_da.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_el.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_es.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_jp.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_nl_NL.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_pl.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_pt_PT.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_ru.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_sq.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_zh_CN.properties
src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_zh_TW.properties
src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/survey/_i18n/LocalStrings_fr.properties
src/main/webapp/static/themes/light/content.css.map
src/main/webapp/static/themes/light/theme.css
src/main/webapp/static/themes/light/theme.css.map
src/main/webapp/static/themes/openolat/content.css.map
src/main/webapp/static/themes/openolat/theme.css
src/main/webapp/static/themes/openolat/theme.css.map

d70e8bd1

Merge remote-tracking branch 'origin/OpenOLAT_14.1' · 87eb0c45

uhensler authored 5 years ago

Conflicts:
src/main/java/org/olat/course/certificate/restapi/CertificationWebService.java
src/main/java/org/olat/course/db/restapi/CourseDbWebService.java
src/main/java/org/olat/course/nodes/co/COWebService.java
src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementsWebService.java
src/main/java/org/olat/modules/fo/restapi/ForumCourseNodeWebService.java
src/main/java/org/olat/modules/fo/restapi/ForumWebService.java
src/main/java/org/olat/registration/restapi/RegistrationWebService.java
src/main/java/org/olat/restapi/group/LearningGroupWebService.java
src/main/java/org/olat/restapi/group/MyGroupWebService.java

87eb0c45

OO-4301: Existing OpenOlat user should be merged with Shibboleth user by username · 64c979b8
uhensler authored 5 years ago

64c979b8

Oct 09, 2019
- OO-4300: Show progress bar only if a course element really stores a progress · 8444e3cd
  uhensler authored 5 years ago
  
  8444e3cd
Oct 08, 2019
- OO-4285: Show score in the structure course node only if user has role participant · 4db84e23
  uhensler authored 5 years ago
  
  4db84e23