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

Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/08/23 10:28:21 UTC

[openmeetings] branch master updated (626d982 -> 4f3bb87)

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

solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.


    from 626d982  Switching to the next development version (#106)
     add 4218027  [OPENMEETINGS-2402] file upload is re-worked (incomplete)
     add 319a105  Merge branch 'master' into OPENMEETINGS-2402-reworked-upload
     add 4f3bb87  [OPENMEETINGS-2402] upload seems to work

No new revisions were added by this update.

Summary of changes:
 .../openmeetings/core/remote/BaseMockedTest.java   |   4 +-
 .../openmeetings/db/entity/file/FileItemTest.java  |   4 +-
 .../apache/openmeetings/web/app/Application.java   |   2 +
 .../openmeetings/web/common/OmWebSocketPanel.java  |  23 +--
 .../org/apache/openmeetings/web/common/main.js     |   4 +-
 .../web/common/tree/FileTreePanel.java             |   6 +-
 .../sidebar/RoomFileUploadResourceReference.java   | 225 +++++++++++++++++++++
 .../web/room/sidebar/UploadDialog.html             |  22 +-
 .../web/room/sidebar/UploadDialog.java             | 225 ++-------------------
 .../apache/openmeetings/web/room/sidebar/upload.js | 127 ++++++++++--
 .../web/user/record/RecordingsPanel.java           |   7 +-
 11 files changed, 383 insertions(+), 266 deletions(-)
 create mode 100644 openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java