You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openmeetings.apache.org by se...@apache.org on 2020/04/05 20:47:53 UTC

[openmeetings] 02/02: Merge branch 'master' into feature/add-more-quick-run-options

This is an automated email from the ASF dual-hosted git repository.

sebawagner pushed a commit to branch feature/add-more-quick-run-options
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit e0d85530eefd5206ceaca0dea47139979f0a0562
Merge: 906dab6 8500f67
Author: Sebastian Wagner <se...@airnz.co.nz>
AuthorDate: Mon Apr 6 08:47:30 2020 +1200

    Merge branch 'master' into feature/add-more-quick-run-options

 .../openmeetings/core/converter/BaseConverter.java | 22 ++++++++++++++++------
 .../core/converter/InterviewConverter.java         |  5 +++++
 .../core/converter/RecordingConverter.java         | 20 +++++---------------
 .../core/converter/VideoConverter.java             |  2 +-
 .../org/apache/openmeetings/core/remote/KRoom.java |  2 +-
 .../util/process/ProcessResultList.java            |  4 ++++
 .../org/apache/openmeetings/web/room/raw-video.js  | 13 ++++---------
 .../apache/openmeetings/web/room/wb/WbPanel.html   |  4 ++--
 .../apache/openmeetings/web/room/wb/raw-wb-area.js |  6 +++---
 .../openmeetings/web/room/wb/raw-wb-board.js       |  2 +-
 10 files changed, 42 insertions(+), 38 deletions(-)