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 2018/02/02 07:10:56 UTC
[openmeetings] 01/01: Merge branch '4.0.x' into
OPENMEETINGS-1791-quick-poll
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch OPENMEETINGS-1791-quick-poll
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 06b8bb78afb92d7eec4200a2e9be23db7ca4855a
Merge: 1f07950 62bc347
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Feb 2 14:10:42 2018 +0700
Merge branch '4.0.x' into OPENMEETINGS-1791-quick-poll
KEYS | 2 +-
openmeetings-db/pom.xml | 2 +-
openmeetings-server/pom.xml | 6 +-
.../src/site/xdoc/BuildInstructions.xml | 2 +-
.../src/site/xdoc/Internationalisation.xml | 4 +-
openmeetings-server/src/site/xdoc/ReleaseGuide.xml | 10 +--
.../src/site/xdoc/RestrictedAccess.xml | 12 ++--
openmeetings-server/src/site/xdoc/WebsiteGuide.xml | 4 +-
openmeetings-server/src/site/xdoc/get-involved.xml | 2 +-
.../src/site/xdoc/themes-and-branding.xml | 4 +-
.../apache/openmeetings/web/room/wb/WbPanel.html | 1 +
.../apache/openmeetings/web/room/wb/tool-arrow.js | 1 +
.../apache/openmeetings/web/room/wb/tool-text.js | 4 +-
.../openmeetings/web/user/chat/ChatToolbar.html | 6 +-
.../openmeetings/web/user/chat/ChatToolbar.java | 4 +-
.../apache/openmeetings/web/user/chat/chat-base.js | 78 ++++++++++++----------
.../openmeetings/web/user/chat/cssemoticons.js | 42 +++---------
pom.xml | 12 ++--
18 files changed, 95 insertions(+), 101 deletions(-)
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.