You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by co...@apache.org on 2017/08/16 04:26:47 UTC
[2/2] openmeetings git commit: Merge
https://git-wip-us.apache.org/repos/asf/openmeetings
Merge https://git-wip-us.apache.org/repos/asf/openmeetings
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e2b0dddb
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e2b0dddb
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e2b0dddb
Branch: refs/heads/master
Commit: e2b0dddb06e30e8e174c1cc97b502b82f2e2f7c7
Parents: 0e02766 5a269bd
Author: Coscend <co...@apache.org>
Authored: Tue Aug 15 23:19:40 2017 -0500
Committer: Coscend <co...@apache.org>
Committed: Tue Aug 15 23:19:40 2017 -0500
----------------------------------------------------------------------
.../openmeetings/db/entity/basic/Client.java | 15 +++--
openmeetings-flash/src/main/flex/main.mxml | 59 +++++++++++++++-----
.../flex/org/apache/openmeetings/OmVideo.as | 54 +++++++++++++++---
openmeetings-web/pom.xml | 24 ++++++++
.../web/admin/connection/ConnectionsPanel.html | 4 +-
.../web/admin/connection/ConnectionsPanel.java | 4 +-
.../apache/openmeetings/web/room/RoomPanel.java | 14 ++---
.../org/apache/openmeetings/web/room/room.js | 38 ++++++++++---
.../openmeetings/web/room/wb/WbPanel.html | 2 +-
pom.xml | 6 +-
10 files changed, 168 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2b0dddb/pom.xml
----------------------------------------------------------------------