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:55 UTC
[openmeetings] branch OPENMEETINGS-1791-quick-poll updated (1f07950
-> 06b8bb7)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch OPENMEETINGS-1791-quick-poll
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from 1f07950 Merge remote-tracking branch 'origin/4.0.x' into OPENMEETINGS-1791-quick-poll
add e5bf058 [OPENMEETINGS-1817] link in chat should workas expected
add da7bf99 [OPENMEETINGS-1777] library versions are updated
add d5bcb14 [OPENMEETINGS-1821] default stroke width for text and arrow are changed
add 9a3d466 [OPENMEETINGS-1824] ability to set wb-text fontFamily is added
add 7f6592f no jira: Links to Git repo are corrected
add 53eee88 [OPENMEETINGS-1818] hover is removed from chat
add d39423f [OPENMEETINGS-1825] chat scroll is improved
add 647d4eb [OPENMEETINGS-1820] multiple emotions seems to work as expected
add 62bc347 [OPENMEETINGS-1820] emoticons animate is extracted to be separate function
new 06b8bb7 Merge branch '4.0.x' into OPENMEETINGS-1791-quick-poll
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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.
[openmeetings] 01/01: Merge branch '4.0.x' into
OPENMEETINGS-1791-quick-poll
Posted by so...@apache.org.
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.