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

May 26, 2020
- no-jira: remove merge conflict · 7b2a2239
  srosse authored 4 years ago
  
  7b2a2239
- Merge remote-tracking branch 'origin/OpenOLAT_15.0' · 4ada15af
  srosse authored 4 years ago
  
  4ada15af
- Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 · 01360a2f
  srosse authored 4 years ago
  
  01360a2f
- OO-4706: Fix merge conflict · 1b6f342e
  uhensler authored 4 years ago
  
  1b6f342e
- OO-4709: show recurring events in course calendar element peekview · a54de654
  srosse authored 4 years ago
  
  a54de654
- OO-4707: use the end test date for leading duration without time limit · b852c4f7
  srosse authored 4 years ago
  
  b852c4f7
May 25, 2020

uhensler authored 4 years ago

Conflicts:
	src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml
	src/main/resources/serviceconfig/olat.properties
	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

139949bb

OO-4706: RS on creating a new wiki page · 93687a8a
uhensler authored 4 years ago

93687a8a
OO-4705: Fix merge conflicts · 816d45dd
uhensler authored 4 years ago

816d45dd

Merge branch 'OpenOLAT_14.2' into OpenOLAT_15.0 · 9ad0c7e6

uhensler authored 4 years ago

Conflicts:
	src/main/java/org/olat/modules/wiki/WikiMainController.java
	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

9ad0c7e6

OO-4705: Very long wiki terms leads to cropped menu · 29f0e459
uhensler authored 4 years ago

29f0e459
OO-4704: Performance tuning to load the data collections · 03a6879e
uhensler authored 4 years ago

03a6879e
OO-4550 Expose results fix · c0260ae3
aboeckle authored 4 years ago

c0260ae3

May 22, 2020
- OO-4676: Validate if item is selected · 93d824e1
  uhensler authored 4 years ago
  
  93d824e1
- OO-4676: Course element edu-sharing · 139f8d8e
  uhensler authored 4 years ago
  
  139f8d8e
May 20, 2020
- no-jira: set version 15.0.1 · ec484737
  srosse authored 4 years ago
  
  OpenOLAT_15.0.1
  
  ec484737
- Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 · 597e477e
  srosse authored 4 years ago
  
  597e477e
- no-jira: set version 14.2.10 · 9e75157f
  srosse authored 4 years ago
  
  OpenOLAT_14.2.10
  
  9e75157f
- Merge remote-tracking branch 'origin/OpenOLAT_15.0' · dc67e325
  srosse authored 4 years ago
  
  dc67e325
- OO-4455 Non administrative users RS fix · 129793ad
  aboeckle authored 4 years ago
  
  129793ad
- Merge remote-tracking branch 'origin/OpenOLAT_15.0' · a3bee604
  srosse authored 4 years ago
  
  a3bee604
- Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 · 0f0efd0d
  srosse authored 4 years ago
  
  0f0efd0d
- OO-4655: fix path to video / audio in wiki on instance with a context · 868706ff
  srosse authored 4 years ago
  
  868706ff
- OO-4455 Non administrative users RS fix · 01d14ffe
  aboeckle authored 4 years ago
  
  01d14ffe
- OO-4630: Disable to move appointments that already have participations · 219be9cb
  uhensler authored 4 years ago
  
  219be9cb
- Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 · 4b318c43
  srosse authored 4 years ago
  
  4b318c43
- OO-4630: Rebook participants of an appointment · a166f6be
  uhensler authored 4 years ago
  
  a166f6be
- no-jira: add message to missing response delcaration in FIB to debug · be181427
  srosse authored 4 years ago
  
  be181427
- OO-4703: check if attachments directory of message exists · e8712576
  srosse authored 4 years ago
  
  e8712576
May 19, 2020
- Merge remote-tracking branch 'origin/OpenOLAT_15.0' · af98f3ec
  srosse authored 4 years ago
  
  af98f3ec
- no-jira: tweaks to selenium tests · 5f96864d
  srosse authored 4 years ago
  
  5f96864d
- Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 · 1d6fe140
  srosse authored 4 years ago
  
  1d6fe140
- OO-4701: lead time in BigBlueButton meeting only for moderators · dfe2f6e1
  srosse authored 4 years ago
  
  dfe2f6e1
- no-jira: hardened selenium read of efficiency statements · 0f699f5a
  srosse authored 4 years ago
  
  0f699f5a
- OO-4702: import points for essay · aff34d22
  srosse authored 4 years ago
  
  aff34d22
- no-jira: wording · 2040b6a3
  srosse authored 4 years ago
  
  2040b6a3
- no-jira: wording · 9e4f75f1
  srosse authored 4 years ago
  
  9e4f75f1
- Merge remote-tracking branch 'origin/OpenOLAT_15.0' · 274ad669
  srosse authored 4 years ago
  
  274ad669
- Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 · f092f66f
  srosse authored 4 years ago
  
  f092f66f
- OO-4700: show the correct default quota for resource folders · 470f095d
  srosse authored 4 years ago
  
  470f095d