Merge branch '4.0.x' of https://git-wip-us.apache.org/repos/asf/openmeetings into 4.0.x
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/53d809d0 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/53d809d0 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/53d809d0 Branch: refs/heads/4.0.x Commit: 53d809d09c652b4413504ca5ab603b52f282aed9 Parents: b37e8b3 e326cff Author: Maxim Solodovnik <[email protected]> Authored: Tue Nov 7 16:27:48 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Nov 7 16:27:48 2017 +0700 ---------------------------------------------------------------------- .../core/data/whiteboard/WhiteboardCache.java | 2 +- .../openmeetings/db/dto/room/Whiteboard.java | 3 +- openmeetings-web/pom.xml | 1 + .../web/app/Application.properties.xml | 1 + .../web/app/Application_ar.properties.xml | 1 + .../web/app/Application_bg.properties.xml | 1 + .../web/app/Application_ca.properties.xml | 1 + .../web/app/Application_cs.properties.xml | 1 + .../web/app/Application_da.properties.xml | 1 + .../web/app/Application_de.properties.xml | 1 + .../web/app/Application_el.properties.xml | 1 + .../web/app/Application_es.properties.xml | 1 + .../web/app/Application_fa.properties.xml | 1 + .../web/app/Application_fi.properties.xml | 1 + .../web/app/Application_fr.properties.xml | 1 + .../web/app/Application_gl.properties.xml | 1 + .../web/app/Application_he.properties.xml | 1 + .../web/app/Application_hu.properties.xml | 1 + .../web/app/Application_id.properties.xml | 1 + .../web/app/Application_it.properties.xml | 1 + .../web/app/Application_ja.properties.xml | 1 + .../web/app/Application_ko.properties.xml | 1 + .../web/app/Application_nl.properties.xml | 1 + .../web/app/Application_pl.properties.xml | 1 + .../web/app/Application_pt.properties.xml | 1 + .../web/app/Application_pt_BR.properties.xml | 1 + .../web/app/Application_ru.properties.xml | 1 + .../web/app/Application_sk.properties.xml | 1 + .../web/app/Application_sv.properties.xml | 1 + .../web/app/Application_th.properties.xml | 1 + .../web/app/Application_tr.properties.xml | 1 + .../web/app/Application_uk.properties.xml | 1 + .../web/app/Application_zh_CN.properties.xml | 1 + .../web/app/Application_zh_TW.properties.xml | 1 + .../web/room/activities/activities.js | 4 +- .../org/apache/openmeetings/web/room/room.js | 11 ++- .../openmeetings/web/room/wb/WbAction.java | 1 + .../openmeetings/web/room/wb/WbPanel.html | 5 +- .../openmeetings/web/room/wb/WbPanel.java | 79 +++++++++++++------- .../openmeetings/web/room/wb/tool-apointer.js | 3 +- .../openmeetings/web/room/wb/tool-arrow.js | 2 +- .../openmeetings/web/room/wb/tool-clipart.js | 9 ++- .../openmeetings/web/room/wb/tool-line.js | 2 +- .../openmeetings/web/room/wb/tool-paint.js | 2 +- .../openmeetings/web/room/wb/tool-pointer.js | 5 +- .../openmeetings/web/room/wb/tool-rect.js | 2 +- .../openmeetings/web/room/wb/tool-shape-base.js | 21 ------ .../openmeetings/web/room/wb/tool-text.js | 2 +- .../openmeetings/web/room/wb/tool-util.js | 32 ++++++++ .../apache/openmeetings/web/room/wb/wb-area.js | 49 +++++++++++- .../apache/openmeetings/web/room/wb/wb-board.js | 4 +- .../apache/openmeetings/web/user/chat/Chat.java | 8 +- openmeetings-web/src/main/webapp/css/wb.css | 1 + 53 files changed, 202 insertions(+), 77 deletions(-) ----------------------------------------------------------------------
