[jira] [Commented] (OPENMEETINGS-2062) Ghosts users stays in room under some circumstances
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2062?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16826806#comment-16826806 ] ASF subversion and git services commented on OPENMEETINGS-2062: --- Commit 81086c34f69d2d784ef8c61effd6dadbab33c2c0 in openmeetings's branch refs/heads/4.0.x from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=81086c3 ] [OPENMEETINGS-2062] user kick should work better > Ghosts users stays in room under some circumstances > --- > > Key: OPENMEETINGS-2062 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2062 > Project: Openmeetings > Issue Type: Bug > Components: Room >Affects Versions: 4.0.8 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 4.0.9, 5.0.0-M2 > > > Ghosts users stays in room under some circumstances > The steps are unclear > "Unenroll" should be improved -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-2062) Ghosts users stays in room under some circumstances
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2062?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16826807#comment-16826807 ] ASF subversion and git services commented on OPENMEETINGS-2062: --- Commit 7b695c283f0c9168cd8c90dc971302d0e3071573 in openmeetings's branch refs/heads/4.0.x from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=7b695c2 ] [OPENMEETINGS-2062] user kick should work better > Ghosts users stays in room under some circumstances > --- > > Key: OPENMEETINGS-2062 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2062 > Project: Openmeetings > Issue Type: Bug > Components: Room >Affects Versions: 4.0.8 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 4.0.9, 5.0.0-M2 > > > Ghosts users stays in room under some circumstances > The steps are unclear > "Unenroll" should be improved -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch 4.0.x updated (f823ef4 -> 7b695c2)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch 4.0.x in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from f823ef4 [OPENMEETINGS-2063] label for whiteboard settings is changed new 81086c3 [OPENMEETINGS-2062] user kick should work better new 7b695c2 [OPENMEETINGS-2062] user kick should work better The 2006 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: .../src/main/java/org/apache/openmeetings/web/app/Application.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)
[jira] [Commented] (OPENMEETINGS-2062) Ghosts users stays in room under some circumstances
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2062?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16826805#comment-16826805 ] ASF subversion and git services commented on OPENMEETINGS-2062: --- Commit 6aa4756dad5d0e8f02f0cec85541e37914fc26f7 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=6aa4756 ] [OPENMEETINGS-2062] user kick should work better > Ghosts users stays in room under some circumstances > --- > > Key: OPENMEETINGS-2062 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2062 > Project: Openmeetings > Issue Type: Bug > Components: Room >Affects Versions: 4.0.8 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 4.0.9, 5.0.0-M2 > > > Ghosts users stays in room under some circumstances > The steps are unclear > "Unenroll" should be improved -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-2062] user kick should work better
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 6aa4756 [OPENMEETINGS-2062] user kick should work better
6aa4756 is described below
commit 6aa4756dad5d0e8f02f0cec85541e37914fc26f7
Author: Maxim Solodovnik
AuthorDate: Fri Apr 26 16:22:30 2019 +0700
[OPENMEETINGS-2062] user kick should work better
---
.../src/main/java/org/apache/openmeetings/web/app/Application.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 535e6a0..4a618be 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -375,7 +375,10 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
}
public static void kickUser(Client client) {
- WebSocketHelper.sendRoom(new
TextRoomMessage(client.getRoom().getId(), client, RoomMessage.Type.kick,
client.getUid()));
+ if (client != null) {
+ WebSocketHelper.sendRoom(new
TextRoomMessage(client.getRoom().getId(), client, RoomMessage.Type.kick,
client.getUid()));
+ get().cm.exitRoom(client);
+ }
}
public static boolean isInvaldSession(String sessionId) {
[jira] [Commented] (OPENMEETINGS-2063) Whiteboard settings button label should be changed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2063?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16826785#comment-16826785 ] ASF subversion and git services commented on OPENMEETINGS-2063: --- Commit f823ef4ce0b5283b88b952fab9c6ba0cf3ed0cba in openmeetings's branch refs/heads/4.0.x from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=f823ef4 ] [OPENMEETINGS-2063] label for whiteboard settings is changed > Whiteboard settings button label should be changed > -- > > Key: OPENMEETINGS-2063 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2063 > Project: Openmeetings > Issue Type: Improvement > Components: WhiteBoard >Affects Versions: 4.0.8 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Trivial > Fix For: 4.0.9, 5.0.0-M2 > > > Whiteboard settings button label should be changed > currently it is "Settings", should be "Whiteboard Settings" -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-2063) Whiteboard settings button label should be changed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2063?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16826784#comment-16826784 ] ASF subversion and git services commented on OPENMEETINGS-2063: --- Commit a6577ed2429528bf1590b2879e363c5bc0afedb3 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=a6577ed ] [OPENMEETINGS-2063] label for whiteboard settings is changed > Whiteboard settings button label should be changed > -- > > Key: OPENMEETINGS-2063 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2063 > Project: Openmeetings > Issue Type: Improvement > Components: WhiteBoard >Affects Versions: 4.0.8 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Trivial > Fix For: 4.0.9, 5.0.0-M2 > > > Whiteboard settings button label should be changed > currently it is "Settings", should be "Whiteboard Settings" -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Resolved] (OPENMEETINGS-2063) Whiteboard settings button label should be changed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2063?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-2063. Resolution: Fixed > Whiteboard settings button label should be changed > -- > > Key: OPENMEETINGS-2063 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2063 > Project: Openmeetings > Issue Type: Improvement > Components: WhiteBoard >Affects Versions: 4.0.8 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Trivial > Fix For: 4.0.9, 5.0.0-M2 > > > Whiteboard settings button label should be changed > currently it is "Settings", should be "Whiteboard Settings" -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-2063] label for whiteboard settings is changed
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git The following commit(s) were added to refs/heads/master by this push: new a6577ed [OPENMEETINGS-2063] label for whiteboard settings is changed a6577ed is described below commit a6577ed2429528bf1590b2879e363c5bc0afedb3 Author: Maxim Solodovnik AuthorDate: Fri Apr 26 15:55:50 2019 +0700 [OPENMEETINGS-2063] label for whiteboard settings is changed --- .../java/org/apache/openmeetings/web/app/Application.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_ar.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_bg.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_bn.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_ca.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_cs.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_da.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_de.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_el.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_es.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_fa.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_fi.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_fr.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_gl.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_he.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_hu.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_in.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_it.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_ja.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_ko.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_nl.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_pl.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_pt.properties.xml | 1 + .../org/apache/openmeetings/web/app/Application_pt_BR.properties.xml| 1 + .../java/org/apache/openmeetings/web/app/Application_ru.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_sk.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_sv.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_th.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_tr.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_uk.properties.xml | 1 + .../org/apache/openmeetings/web/app/Application_zh_CN.properties.xml| 1 + .../org/apache/openmeetings/web/app/Application_zh_TW.properties.xml| 1 + .../src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 2 +- 33 files changed, 33 insertions(+), 1 deletion(-) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml index f86a0e7..fa4c41f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml @@ -996,4 +996,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details + diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml index 22519e1..c3fa4ec 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml @@ -996,4 +996,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details + diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml index ec6de8e..87bcd1e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml @@ -996,4 +996,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details + diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2063] label for whiteboard settings is changed
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch 4.0.x in repository https://gitbox.apache.org/repos/asf/openmeetings.git The following commit(s) were added to refs/heads/4.0.x by this push: new f823ef4 [OPENMEETINGS-2063] label for whiteboard settings is changed f823ef4 is described below commit f823ef4ce0b5283b88b952fab9c6ba0cf3ed0cba Author: Maxim Solodovnik AuthorDate: Fri Apr 26 15:55:50 2019 +0700 [OPENMEETINGS-2063] label for whiteboard settings is changed --- .../java/org/apache/openmeetings/web/app/Application.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_ar.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_bg.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_bn.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_ca.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_cs.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_da.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_de.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_el.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_es.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_fa.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_fi.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_fr.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_gl.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_he.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_hu.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_in.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_it.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_ja.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_ko.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_nl.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_pl.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_pt.properties.xml | 1 + .../org/apache/openmeetings/web/app/Application_pt_BR.properties.xml| 1 + .../java/org/apache/openmeetings/web/app/Application_ru.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_sk.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_sv.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_th.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_tr.properties.xml | 1 + .../java/org/apache/openmeetings/web/app/Application_uk.properties.xml | 1 + .../org/apache/openmeetings/web/app/Application_zh_CN.properties.xml| 1 + .../org/apache/openmeetings/web/app/Application_zh_TW.properties.xml| 1 + .../src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 2 +- 33 files changed, 33 insertions(+), 1 deletion(-) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml index 606b469..b9362c8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml @@ -996,4 +996,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details + diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml index 6eb2387..e22af82 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml @@ -996,4 +996,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details + diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml index dc9942f..11c04b8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml @@ -996,4 +996,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details + diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
[jira] [Created] (OPENMEETINGS-2063) Whiteboard settings button label should be changed
Maxim Solodovnik created OPENMEETINGS-2063: -- Summary: Whiteboard settings button label should be changed Key: OPENMEETINGS-2063 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2063 Project: Openmeetings Issue Type: Improvement Components: WhiteBoard Affects Versions: 4.0.8 Reporter: Maxim Solodovnik Assignee: Maxim Solodovnik Fix For: 4.0.9, 5.0.0-M2 Whiteboard settings button label should be changed currently it is "Settings", should be "Whiteboard Settings" -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Resolved] (OPENMEETINGS-2062) Ghosts users stays in room under some circumstances
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2062?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-2062. Resolution: Fixed should be fixed > Ghosts users stays in room under some circumstances > --- > > Key: OPENMEETINGS-2062 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2062 > Project: Openmeetings > Issue Type: Bug > Components: Room >Affects Versions: 4.0.8 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 4.0.9, 5.0.0-M2 > > > Ghosts users stays in room under some circumstances > The steps are unclear > "Unenroll" should be improved -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2062] unenroll should work better
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 5da9392 [OPENMEETINGS-2062] unenroll should work better
5da9392 is described below
commit 5da9392101c95c4504b89146351f91399660c3e1
Author: Maxim Solodovnik
AuthorDate: Fri Apr 26 14:16:15 2019 +0700
[OPENMEETINGS-2062] unenroll should work better
---
.../apache/openmeetings/web/app/ClientManager.java | 24 --
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index 08a954f..129bd08 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -31,6 +31,7 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
@@ -290,26 +291,17 @@ public class ClientManager implements IClientManager {
return false;
}
- private Client getByKeys(Long userId, String sessionId) {
- Client client = null;
- for (Map.Entry e : map().entrySet()) {
- Client c = e.getValue();
- if (c.getUserId().equals(userId) &&
c.getSessionId().equals(sessionId)) {
- client = c;
- break;
- }
- }
- return client;
+ private List getByKeys(Long userId, String sessionId) {
+ return map().values().stream()
+ .filter(c -> c.getUserId().equals(userId) &&
c.getSessionId().equals(sessionId))
+ .collect(Collectors.toList());
}
public void invalidate(Long userId, String sessionId) {
- Client client = getByKeys(userId, sessionId);
- if (client != null) {
+ for (Client c : getByKeys(userId, sessionId)) {
Map invalid =
Application.get().getInvalidSessions();
- if (!invalid.containsKey(client.getSessionId())) {
- invalid.put(client.getSessionId(),
client.getUid());
- exit(client);
- }
+ invalid.putIfAbsent(sessionId, c.getUid());
+ exit(c);
}
}
[jira] [Commented] (OPENMEETINGS-2062) Ghosts users stays in room under some circumstances
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2062?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16826719#comment-16826719 ] ASF subversion and git services commented on OPENMEETINGS-2062: --- Commit 5da9392101c95c4504b89146351f91399660c3e1 in openmeetings's branch refs/heads/4.0.x from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=5da9392 ] [OPENMEETINGS-2062] unenroll should work better > Ghosts users stays in room under some circumstances > --- > > Key: OPENMEETINGS-2062 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2062 > Project: Openmeetings > Issue Type: Bug > Components: Room >Affects Versions: 4.0.8 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 4.0.9, 5.0.0-M2 > > > Ghosts users stays in room under some circumstances > The steps are unclear > "Unenroll" should be improved -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-2062] unenroll should work better
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 53e87dc [OPENMEETINGS-2062] unenroll should work better
53e87dc is described below
commit 53e87dc2103f92430ac2bac8ec793645668ea5e7
Author: Maxim Solodovnik
AuthorDate: Fri Apr 26 14:16:15 2019 +0700
[OPENMEETINGS-2062] unenroll should work better
---
.../apache/openmeetings/web/app/ClientManager.java | 24 --
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index 94dffd3..3f87d4b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -29,6 +29,7 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
@@ -274,26 +275,17 @@ public class ClientManager implements IClientManager {
return false;
}
- private Client getByKeys(Long userId, String sessionId) {
- Client client = null;
- for (Map.Entry e : map().entrySet()) {
- Client c = e.getValue();
- if (c.getUserId().equals(userId) &&
c.getSessionId().equals(sessionId)) {
- client = c;
- break;
- }
- }
- return client;
+ private List getByKeys(Long userId, String sessionId) {
+ return map().values().stream()
+ .filter(c -> c.getUserId().equals(userId) &&
c.getSessionId().equals(sessionId))
+ .collect(Collectors.toList());
}
public void invalidate(Long userId, String sessionId) {
- Client client = getByKeys(userId, sessionId);
- if (client != null) {
+ for (Client c : getByKeys(userId, sessionId)) {
Map invalid =
Application.get().getInvalidSessions();
- if (!invalid.containsKey(client.getSessionId())) {
- invalid.put(client.getSessionId(),
client.getUid());
- exit(client);
- }
+ invalid.putIfAbsent(sessionId, c.getUid());
+ exit(c);
}
}
[jira] [Created] (OPENMEETINGS-2062) Ghosts users stays in room under some circumstances
Maxim Solodovnik created OPENMEETINGS-2062: -- Summary: Ghosts users stays in room under some circumstances Key: OPENMEETINGS-2062 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2062 Project: Openmeetings Issue Type: Bug Components: Room Affects Versions: 4.0.8 Reporter: Maxim Solodovnik Assignee: Maxim Solodovnik Fix For: 4.0.9, 5.0.0-M2 Ghosts users stays in room under some circumstances The steps are unclear "Unenroll" should be improved -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-2055) uploading MP3
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2055?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16826690#comment-16826690 ] ASF subversion and git services commented on OPENMEETINGS-2055: --- Commit 3c126a3b0493e4027d9350323aaa7c824cf3b3b9 in openmeetings's branch refs/heads/4.0.x from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=3c126a3 ] [OPENMEETINGS-2055] dialog title conversion is improved > uploading MP3 > - > > Key: OPENMEETINGS-2055 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2055 > Project: Openmeetings > Issue Type: Bug > Components: Import/Export >Affects Versions: 4.0.8 > Environment: Ubuntu 14.04 12 GB ram quad core processor >Reporter: Horace Miles >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.9, 5.0.0-M2 > > Attachments: 14fb0d69-4cde-45d6-bb10-b8b81e07c2ec.mp4, > OmeetPostUpload.png, image-2019-04-10-03-01-42-577.png, > omalteametsoftUpload.png, omeetPreUpload.png, resultwindow.png > > > When uploading MP3 or MP4 files, after approximately 60 seconds I get the > connection has been lost. > I have changed the config/jee-container.xml >value="1"/> to ' .>' > after this happens, I have the option to reload, which creates a new user in > the room. The fill does not show up in the uploaded folder. I have to > restart red5-ubdeb2 restart to get rid of the ghosted users and > additionally, sometimes the file I was trying to upload will also show after > the restart. I have hundreds of files to upload and I would really like to > make this work smoothly has I have other users waiting to use openmeetings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-2055) uploading MP3
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2055?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16826689#comment-16826689 ] ASF subversion and git services commented on OPENMEETINGS-2055: --- Commit 816e337aa6a3ae1039de4daa2ae209b157b1a426 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=816e337 ] [OPENMEETINGS-2055] dialog title conversion is improved > uploading MP3 > - > > Key: OPENMEETINGS-2055 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2055 > Project: Openmeetings > Issue Type: Bug > Components: Import/Export >Affects Versions: 4.0.8 > Environment: Ubuntu 14.04 12 GB ram quad core processor >Reporter: Horace Miles >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.9, 5.0.0-M2 > > Attachments: 14fb0d69-4cde-45d6-bb10-b8b81e07c2ec.mp4, > OmeetPostUpload.png, image-2019-04-10-03-01-42-577.png, > omalteametsoftUpload.png, omeetPreUpload.png, resultwindow.png > > > When uploading MP3 or MP4 files, after approximately 60 seconds I get the > connection has been lost. > I have changed the config/jee-container.xml >value="1"/> to ' .>' > after this happens, I have the option to reload, which creates a new user in > the room. The fill does not show up in the uploaded folder. I have to > restart red5-ubdeb2 restart to get rid of the ghosted users and > additionally, sometimes the file I was trying to upload will also show after > the restart. I have hundreds of files to upload and I would really like to > make this work smoothly has I have other users waiting to use openmeetings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-2055] dialog title conversion is improved
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 816e337 [OPENMEETINGS-2055] dialog title conversion is improved
816e337 is described below
commit 816e337aa6a3ae1039de4daa2ae209b157b1a426
Author: Maxim Solodovnik
AuthorDate: Fri Apr 26 13:25:51 2019 +0700
[OPENMEETINGS-2055] dialog title conversion is improved
---
.../java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index c29bd6d..9d378f6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -120,6 +120,7 @@ public class UploadDialog extends
AbstractFormDialog {
target.add(progressBar.setVisible(false));
room.getSidebar().updateFiles(target);
if (form.hasError()) {
+ setTitle(target,
getString("upload.dlg.choose.title"));
target.add(form.setVisible(true));
onError(target, null);
} else {
@@ -222,7 +223,7 @@ public class UploadDialog extends
AbstractFormDialog {
@Override
protected void onOpen(IPartialPageRequestHandler handler) {
- setTitle(handler, getString("upload.dlg.convert.title"));
+ setTitle(handler, getString("upload.dlg.choose.title"));
super.onOpen(handler);
upload.setEnabled(true, handler);
uploadField.setModelObject(new ArrayList<>());
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2055] dialog title conversion is improved
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 3c126a3 [OPENMEETINGS-2055] dialog title conversion is improved
3c126a3 is described below
commit 3c126a3b0493e4027d9350323aaa7c824cf3b3b9
Author: Maxim Solodovnik
AuthorDate: Fri Apr 26 13:25:51 2019 +0700
[OPENMEETINGS-2055] dialog title conversion is improved
---
.../java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index fea3893..633e51f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -115,6 +115,7 @@ public class UploadDialog extends
AbstractFormDialog {
target.add(progressBar.setVisible(false));
room.getSidebar().updateFiles(target);
if (form.hasError()) {
+ setTitle(target,
getString("upload.dlg.choose.title"));
target.add(form.setVisible(true));
onError(target, null);
} else {
@@ -217,7 +218,7 @@ public class UploadDialog extends
AbstractFormDialog {
@Override
protected void onOpen(IPartialPageRequestHandler handler) {
- setTitle(handler, getString("upload.dlg.convert.title"));
+ setTitle(handler, getString("upload.dlg.choose.title"));
super.onOpen(handler);
upload.setEnabled(true, handler);
uploadField.setModelObject(new ArrayList<>());
[jira] [Commented] (OPENMEETINGS-2055) uploading MP3
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2055?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16826687#comment-16826687 ] Maxim Solodovnik commented on OPENMEETINGS-2055: As you can see at [^14fb0d69-4cde-45d6-bb10-b8b81e07c2ec.mp4] video attached this functionality works as expected I also have added "title changing during conversion" > uploading MP3 > - > > Key: OPENMEETINGS-2055 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2055 > Project: Openmeetings > Issue Type: Bug > Components: Import/Export >Affects Versions: 4.0.8 > Environment: Ubuntu 14.04 12 GB ram quad core processor >Reporter: Horace Miles >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.9, 5.0.0-M2 > > Attachments: 14fb0d69-4cde-45d6-bb10-b8b81e07c2ec.mp4, > OmeetPostUpload.png, image-2019-04-10-03-01-42-577.png, > omalteametsoftUpload.png, omeetPreUpload.png, resultwindow.png > > > When uploading MP3 or MP4 files, after approximately 60 seconds I get the > connection has been lost. > I have changed the config/jee-container.xml >value="1"/> to ' .>' > after this happens, I have the option to reload, which creates a new user in > the room. The fill does not show up in the uploaded folder. I have to > restart red5-ubdeb2 restart to get rid of the ghosted users and > additionally, sometimes the file I was trying to upload will also show after > the restart. I have hundreds of files to upload and I would really like to > make this work smoothly has I have other users waiting to use openmeetings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-2055) uploading MP3
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2055?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16826681#comment-16826681 ] ASF subversion and git services commented on OPENMEETINGS-2055: --- Commit a04efadd08d23cbc97a32f4d2a5de9951f46cb98 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=a04efad ] [OPENMEETINGS-2055] dialog title during conversion is changed > uploading MP3 > - > > Key: OPENMEETINGS-2055 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2055 > Project: Openmeetings > Issue Type: Bug > Components: Import/Export >Affects Versions: 4.0.8 > Environment: Ubuntu 14.04 12 GB ram quad core processor >Reporter: Horace Miles >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.9, 5.0.0-M2 > > Attachments: 14fb0d69-4cde-45d6-bb10-b8b81e07c2ec.mp4, > OmeetPostUpload.png, image-2019-04-10-03-01-42-577.png, > omalteametsoftUpload.png, omeetPreUpload.png, resultwindow.png > > > When uploading MP3 or MP4 files, after approximately 60 seconds I get the > connection has been lost. > I have changed the config/jee-container.xml >value="1"/> to ' .>' > after this happens, I have the option to reload, which creates a new user in > the room. The fill does not show up in the uploaded folder. I have to > restart red5-ubdeb2 restart to get rid of the ghosted users and > additionally, sometimes the file I was trying to upload will also show after > the restart. I have hundreds of files to upload and I would really like to > make this work smoothly has I have other users waiting to use openmeetings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (OPENMEETINGS-2055) uploading MP3
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2055?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-2055: --- Attachment: 14fb0d69-4cde-45d6-bb10-b8b81e07c2ec.mp4 > uploading MP3 > - > > Key: OPENMEETINGS-2055 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2055 > Project: Openmeetings > Issue Type: Bug > Components: Import/Export >Affects Versions: 4.0.8 > Environment: Ubuntu 14.04 12 GB ram quad core processor >Reporter: Horace Miles >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.9, 5.0.0-M2 > > Attachments: 14fb0d69-4cde-45d6-bb10-b8b81e07c2ec.mp4, > OmeetPostUpload.png, image-2019-04-10-03-01-42-577.png, > omalteametsoftUpload.png, omeetPreUpload.png, resultwindow.png > > > When uploading MP3 or MP4 files, after approximately 60 seconds I get the > connection has been lost. > I have changed the config/jee-container.xml >value="1"/> to ' .>' > after this happens, I have the option to reload, which creates a new user in > the room. The fill does not show up in the uploaded folder. I have to > restart red5-ubdeb2 restart to get rid of the ghosted users and > additionally, sometimes the file I was trying to upload will also show after > the restart. I have hundreds of files to upload and I would really like to > make this work smoothly has I have other users waiting to use openmeetings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-2055) uploading MP3
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2055?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16826682#comment-16826682 ] ASF subversion and git services commented on OPENMEETINGS-2055: --- Commit 9dd7b245350e1819a0bc0cb22855662b079e2b43 in openmeetings's branch refs/heads/4.0.x from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=9dd7b24 ] [OPENMEETINGS-2055] dialog title during conversion is changed > uploading MP3 > - > > Key: OPENMEETINGS-2055 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2055 > Project: Openmeetings > Issue Type: Bug > Components: Import/Export >Affects Versions: 4.0.8 > Environment: Ubuntu 14.04 12 GB ram quad core processor >Reporter: Horace Miles >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.9, 5.0.0-M2 > > Attachments: 14fb0d69-4cde-45d6-bb10-b8b81e07c2ec.mp4, > OmeetPostUpload.png, image-2019-04-10-03-01-42-577.png, > omalteametsoftUpload.png, omeetPreUpload.png, resultwindow.png > > > When uploading MP3 or MP4 files, after approximately 60 seconds I get the > connection has been lost. > I have changed the config/jee-container.xml >value="1"/> to ' .>' > after this happens, I have the option to reload, which creates a new user in > the room. The fill does not show up in the uploaded folder. I have to > restart red5-ubdeb2 restart to get rid of the ghosted users and > additionally, sometimes the file I was trying to upload will also show after > the restart. I have hundreds of files to upload and I would really like to > make this work smoothly has I have other users waiting to use openmeetings. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2055] dialog title during conversion is changed
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch 4.0.x in repository https://gitbox.apache.org/repos/asf/openmeetings.git The following commit(s) were added to refs/heads/4.0.x by this push: new 9dd7b24 [OPENMEETINGS-2055] dialog title during conversion is changed 9dd7b24 is described below commit 9dd7b245350e1819a0bc0cb22855662b079e2b43 Author: Maxim Solodovnik AuthorDate: Fri Apr 26 13:21:53 2019 +0700 [OPENMEETINGS-2055] dialog title during conversion is changed --- .../java/org/apache/openmeetings/web/app/Application.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_ar.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_bg.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_bn.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_ca.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_cs.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_da.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_de.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_el.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_es.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_fa.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_fi.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_fr.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_gl.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_he.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_hu.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_in.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_it.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_ja.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_ko.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_nl.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_pl.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_pt.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_pt_BR.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_ru.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_sk.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_sv.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_th.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_tr.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_uk.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_zh_CN.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_zh_TW.properties.xml | 3 ++- .../java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java | 4 +++- 33 files changed, 67 insertions(+), 33 deletions(-) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml index 085abfe..606b469 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml @@ -148,7 +148,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details - @@ -995,4 +994,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details + + diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml index 74a25ea..6eb2387 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml @@ -148,7 +148,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details - @@ -995,4 +994,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details + + diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml index 8ee68d7..dc9942f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml +++
[openmeetings] branch master updated: [OPENMEETINGS-2055] dialog title during conversion is changed
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git The following commit(s) were added to refs/heads/master by this push: new a04efad [OPENMEETINGS-2055] dialog title during conversion is changed a04efad is described below commit a04efadd08d23cbc97a32f4d2a5de9951f46cb98 Author: Maxim Solodovnik AuthorDate: Fri Apr 26 13:21:53 2019 +0700 [OPENMEETINGS-2055] dialog title during conversion is changed --- .../java/org/apache/openmeetings/web/app/Application.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_ar.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_bg.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_bn.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_ca.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_cs.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_da.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_de.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_el.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_es.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_fa.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_fi.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_fr.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_gl.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_he.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_hu.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_in.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_it.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_ja.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_ko.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_nl.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_pl.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_pt.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_pt_BR.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_ru.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_sk.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_sv.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_th.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_tr.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_uk.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_zh_CN.properties.xml | 3 ++- .../org/apache/openmeetings/web/app/Application_zh_TW.properties.xml | 3 ++- .../java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java | 4 +++- 33 files changed, 67 insertions(+), 33 deletions(-) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml index 001108d..f86a0e7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml @@ -148,7 +148,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details - @@ -995,4 +994,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details + + diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml index 5646637..22519e1 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml @@ -148,7 +148,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details - @@ -995,4 +994,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details + + diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml index 7bb8949..ec6de8e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml +++
