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 2017/12/07 03:29:54 UTC
[5/5] openmeetings git commit: Merge branch '4.0.x' into reflow-branch
Merge branch '4.0.x' into reflow-branch
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/26f627ee
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/26f627ee
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/26f627ee
Branch: refs/heads/reflow-branch
Commit: 26f627eee4231eeeaec9319d8ae537f8acff0b43
Parents: 0211189 8810c49
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Dec 7 10:29:37 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Dec 7 10:29:37 2017 +0700
----------------------------------------------------------------------
CHANGELOG | 55 ++++++++++++++++++++
README | 16 ++++++
.../src/site/xdoc/NewsArchive.xml | 34 ++++++++++++
openmeetings-server/src/site/xdoc/downloads.xml | 38 +++++++-------
openmeetings-server/src/site/xdoc/index.xml | 37 +++++--------
.../web/room/sidebar/RoomClientPanel.html | 2 +-
.../openmeetings/web/user/chat/chat-base.js | 20 +++++--
openmeetings-web/src/main/webapp/css/chat.css | 2 +-
pom.xml | 2 +-
9 files changed, 157 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26f627ee/openmeetings-server/src/site/xdoc/index.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26f627ee/pom.xml
----------------------------------------------------------------------