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/24 17:09:07 UTC
[openmeetings] 02/02: Merge branch 'OPENMEETINGS-1791-quick-poll'
of github.com:apache/openmeetings 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 cf1c605e182cd27e62183960aed82a254f0cf539
Merge: 11cfea4 5759fdd
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun Feb 25 00:08:51 2018 +0700
Merge branch 'OPENMEETINGS-1791-quick-poll' of github.com:apache/openmeetings into OPENMEETINGS-1791-quick-poll
CHANGELOG | 96 +-
LICENSE | 14 +-
README | 28 +-
openmeetings-core/pom.xml | 2 +-
.../openmeetings/core/remote/MobileService.java | 2 +-
.../core/remote/ScopeApplicationAdapter.java | 13 +-
openmeetings-db/pom.xml | 2 +-
openmeetings-flash/pom.xml | 2 +-
openmeetings-flash/src/main/flex/main.mxml | 7 +
.../main/flex/org/apache/openmeetings/OmVideo.as | 4 +
openmeetings-install/pom.xml | 2 +-
openmeetings-screenshare/pom.xml | 2 +-
.../screenshare/gui/ScreenSharerFrame.java | 7 +-
openmeetings-server/pom.xml | 2 +-
openmeetings-server/src/site/xdoc/JUnitTesting.xml | 2 +-
openmeetings-server/src/site/xdoc/NewsArchive.xml | 25 +
openmeetings-server/src/site/xdoc/ReleaseGuide.xml | 14 +-
openmeetings-server/src/site/xdoc/downloads.xml | 36 +-
openmeetings-server/src/site/xdoc/index.xml | 39 +-
.../src/site/xdoc/red5sip-integration_2.0.xml | 178 ---
.../src/site/xdoc/red5sip-integration_2.1.xml | 325 ----
.../src/site/xdoc/red5sip-integration_3.0.xml | 311 ----
.../src/site/xdoc/red5sip-integration_3.1.xml | 305 ----
.../src/site/xdoc/red5sip-integration_3.3.xml | 317 ----
.../src/site/xdoc/red5sip-integration_4.0.xml | 316 ----
openmeetings-server/src/site/xdoc/security.xml | 23 +
.../src/site/xdoc/voip-sip-integration.xml | 310 +++-
openmeetings-service/pom.xml | 4 +-
openmeetings-util/pom.xml | 2 +-
openmeetings-web/pom.xml | 2 +-
.../openmeetings/web/admin/AdminBaseForm.java | 34 +-
.../openmeetings/web/admin/SearchableDataView.java | 2 +-
.../openmeetings/web/admin/labels/LangForm.java | 7 +-
.../web/app/Application_fa.properties.xml | 1580 ++++++++++----------
.../apache/openmeetings/web/common/BasePanel.java | 7 +-
.../web/common/ConfirmableAjaxBorder.java | 8 +-
.../openmeetings/web/common/menu/OmMenuItem.java | 3 +-
.../web/common/tree/FileTreePanel.html | 26 +-
.../web/common/tree/FileTreePanel.java | 4 +-
.../web/data/SearchableDataProvider.java | 2 +-
.../web/room/OmRedirectTimerBehavior.java | 2 +-
.../apache/openmeetings/web/room/RoomPanel.java | 11 +-
.../org/apache/openmeetings/web/room/room-base.js | 14 +-
.../web/room/sidebar/RoomFilePanel.java | 8 +
.../openmeetings/web/room/sidebar/RoomSidebar.html | 4 +-
.../openmeetings/web/room/sidebar/RoomSidebar.java | 14 +-
.../org/apache/openmeetings/web/room/wb/MathJax.js | 260 ++--
.../org/apache/openmeetings/web/room/wb/fabric.js | 231 +--
.../apache/openmeetings/web/room/wb/tool-util.js | 2 +-
.../web/user/calendar/CalendarDialog.java | 8 +
.../openmeetings/web/user/chat/ChatToolbar.java | 4 +
.../apache/openmeetings/web/user/chat/chat-base.js | 21 +-
.../openmeetings/web/user/chat/cssemoticons.js | 166 +-
.../openmeetings/web/user/rooms/RoomListPanel.java | 10 +-
.../src/main/webapp/css/cssemoticons.css | 183 +--
openmeetings-web/src/main/webapp/css/room.css | 33 +-
openmeetings-webservice/pom.xml | 2 +-
pom.xml | 14 +-
58 files changed, 1844 insertions(+), 3208 deletions(-)
diff --cc openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
index 256da85,caa1026..4260bae
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
@@@ -418,10 -418,10 +418,10 @@@ public class MobileService
final Long roomId = c.getRoomId();
//Sync to all users of current scope
- new MessageSender(scopeAdapter.getChildScope("" + roomId), "sendVarsToMessageWithClient", hsm, scopeAdapter) {
+ new MessageSender(scopeAdapter.getChildScope(roomId), "sendVarsToMessageWithClient", hsm, scopeAdapter) {
@Override
public boolean filter(IConnection conn) {
- StreamClient rcl = sessionManager.get(IClientUtil.getId(conn.getClient()));
+ StreamClient rcl = streamClientManager.get(IClientUtil.getId(conn.getClient()));
return Client.Type.sharing == rcl.getType()
|| rcl.getRoomId() == null || !rcl.getRoomId().equals(roomId);
}
diff --cc openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index fcac1ca,08ffdd4..b06e0af
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@@ -704,10 -697,10 +699,10 @@@ public class ScopeApplicationAdapter ex
}
public void sendToScope(final Long roomId, String method, Object obj) {
- new MessageSender(getChildScope(String.valueOf(roomId)), method, obj, this) {
+ new MessageSender(getChildScope(roomId), method, obj, this) {
@Override
public boolean filter(IConnection conn) {
- StreamClient rcl = sessionManager.get(IClientUtil.getId(conn.getClient()));
+ StreamClient rcl = streamClientManager.get(IClientUtil.getId(conn.getClient()));
return rcl == null || Client.Type.sharing == rcl.getType()
|| rcl.getRoomId() == null || !rcl.getRoomId().equals(roomId) || userDao.get(rcl.getUserId()) == null;
}
diff --cc openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 8d4680d,8eaf87f..923d97a
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@@ -19,7 -19,9 +19,8 @@@
package org.apache.openmeetings.web.room.sidebar;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
-import static org.apache.openmeetings.web.app.Application.getOnlineClient;
-import static org.apache.openmeetings.web.app.Application.getRoomClients;
+import static org.apache.openmeetings.web.app.Application.getBean;
+ import static org.apache.openmeetings.web.app.Application.kickUser;
import static org.apache.openmeetings.web.room.RoomBroadcaster.sendUpdatedClient;
import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.