[openmeetings] branch master updated: No-Jira - Update support page.
This is an automated email from the ASF dual-hosted git repository. sebawagner 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 e73c60d No-Jira - Update support page. e73c60d is described below commit e73c60d1c9d834be450f1a7b447f036b1c4c1538 Author: Sebastian Wagner AuthorDate: Wed Jan 13 18:22:54 2021 +1300 No-Jira - Update support page. --- openmeetings-server/src/site/xdoc/commercial-support.xml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/openmeetings-server/src/site/xdoc/commercial-support.xml b/openmeetings-server/src/site/xdoc/commercial-support.xml index 3752ff0..2b179be 100644 --- a/openmeetings-server/src/site/xdoc/commercial-support.xml +++ b/openmeetings-server/src/site/xdoc/commercial-support.xml @@ -40,6 +40,13 @@ Please write to mailto:om.uni...@gmail.com;>om.uni...@gmail.com to get UniPro support + As well as additionally for hosting offers: + + + https://om-hosting.com; target="_blank">om-hosting.com + Cloud based hosting for OpenMeetings + + There are more companies offering installation, customization, hosting, conferencing and support services. You can add yourself to the https://cwiki.apache.org/confluence/display/OPENMEETINGS/Commercial+Support;>wiki page.
[openmeetings-site] branch asf-site updated: No-Jira Update Website support offers.
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 7e253c0 No-Jira Update Website support offers. 7e253c0 is described below commit 7e253c0c47ec6f0c226ad2378fe5aa51f178eef9 Author: Sebastian Wagner AuthorDate: Wed Jan 13 18:21:29 2021 +1300 No-Jira Update Website support offers. --- commercial-support.html | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/commercial-support.html b/commercial-support.html index 75e48d7..d5e8de2 100644 --- a/commercial-support.html +++ b/commercial-support.html @@ -3,7 +3,7 @@ @@ -214,7 +214,7 @@ -Last Published: 2020-12-05 +Last Published: 2021-01-13 @@ -227,6 +227,10 @@ http://www.samoo.es; target="_blank" rel="nofollow">samoo.es provides support for the Sakai Plugin Please write to mailto:om.uni...@gmail.com;>om.uni...@gmail.com to get UniPro support + As well as additionally for hosting offers: + + https://om-hosting.com; target="_blank">om-hosting.com Cloud based hosting for OpenMeetings + There are more companies offering installation, customization, hosting, conferencing and support services. You can add yourself to the https://cwiki.apache.org/confluence/display/OPENMEETINGS/Commercial+Support;>wiki page. Want to get listed here? Become a http://www.apache.org/dev/committers.html;>committer. @@ -312,7 +316,7 @@ Development -Copyright 2012-2020 +Copyright 2012-2021 https://apache.org;>Apache Software Foundation . All Rights Reserved.
[openmeetings] 01/01: Merge pull request #114 from apache/feature/OPENMEETINGS-2504-add-classes-to-make-dialog-unique-for-selenium
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 027a1b00330f8acb019bd6522dff872036ee1417 Merge: 2807167 532d61b Author: Sebastian Wagner AuthorDate: Mon Nov 2 14:15:30 2020 +1300 Merge pull request #114 from apache/feature/OPENMEETINGS-2504-add-classes-to-make-dialog-unique-for-selenium OPENMEETINGS-2504 Add css classes for dialog to make CSS selector possible .../src/main/java/org/apache/openmeetings/web/room/RoomPanel.html | 2 +- .../src/main/java/org/apache/openmeetings/web/room/raw-video-util.js| 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
[openmeetings] branch master updated (2807167 -> 027a1b0)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 2807167 [OPENMEETINGS-2239] code clean-up add c3322f8 OPENMEETINGS-2504 Add css classes for dialog to make CSS selector possible to uniquely identify the OK confirmation button. add 532d61b OPENMEETINGS-2504 Change name of css class. new 027a1b0 Merge pull request #114 from apache/feature/OPENMEETINGS-2504-add-classes-to-make-dialog-unique-for-selenium 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: .../src/main/java/org/apache/openmeetings/web/room/RoomPanel.html | 2 +- .../src/main/java/org/apache/openmeetings/web/room/raw-video-util.js| 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
[openmeetings] branch feature/OPENMEETINGS-2504-add-classes-to-make-dialog-unique-for-selenium updated (c3322f8 -> 532d61b)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2504-add-classes-to-make-dialog-unique-for-selenium in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from c3322f8 OPENMEETINGS-2504 Add css classes for dialog to make CSS selector possible to uniquely identify the OK confirmation button. add 532d61b OPENMEETINGS-2504 Change name of css class. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/openmeetings/web/room/raw-video-util.js| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[openmeetings] 01/01: OPENMEETINGS-2504 Add css classes for dialog to make CSS selector possible to uniquely identify the OK confirmation button.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2504-add-classes-to-make-dialog-unique-for-selenium
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit c3322f8145faefaa0a27c1da14ae895dc6cea696
Author: Sebastian Wagner
AuthorDate: Sun Nov 1 14:11:54 2020 +1300
OPENMEETINGS-2504 Add css classes for dialog to make CSS selector possible
to uniquely identify the OK confirmation button.
---
.../src/main/java/org/apache/openmeetings/web/room/RoomPanel.html | 2 +-
.../src/main/java/org/apache/openmeetings/web/room/raw-video-util.js| 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
index 315953b..431d75c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
@@ -34,7 +34,7 @@
-
+
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
index 11bb8b8..5cbcb6e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
@@ -245,6 +245,7 @@ var VideoUtil = (function() {
if (undefined === perm.dialog('instance')) {
perm.data('callbacks', []).dialog({
appendTo: '.room-block .room-container'
+ , dialogClass: "ask-permission"
, autoOpen: true
, buttons: [
{
[openmeetings] branch feature/OPENMEETINGS-2504-add-classes-to-make-dialog-unique-for-selenium created (now c3322f8)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2504-add-classes-to-make-dialog-unique-for-selenium in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at c3322f8 OPENMEETINGS-2504 Add css classes for dialog to make CSS selector possible to uniquely identify the OK confirmation button. This branch includes the following new commits: new c3322f8 OPENMEETINGS-2504 Add css classes for dialog to make CSS selector possible to uniquely identify the OK confirmation button. 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.
[openmeetings] branch master updated (b24cc0c -> 95592a6)
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from b24cc0c [OPENMEETINGS-2469] java11 modules for hazelcast are added
add 0dae53e OPENMEETINGS-2470 Fix and remove filters while running in dev
version.
new 95592a6 Merge pull request #112 from
apache/feature/OPENMEETINGS-2470-supply-jetty-with-test-web-xml
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:
openmeetings-web/pom.xml | 1 +
.../{main/webapp/WEB-INF => test/jetty}/web.xml| 34 --
2 files changed, 1 insertion(+), 34 deletions(-)
copy openmeetings-web/src/{main/webapp/WEB-INF => test/jetty}/web.xml (71%)
[openmeetings] 01/01: Merge pull request #112 from apache/feature/OPENMEETINGS-2470-supply-jetty-with-test-web-xml
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 95592a653da98b3392c712002583d7cf096609c1 Merge: b24cc0c 0dae53e Author: Sebastian Wagner AuthorDate: Sat Oct 3 09:06:29 2020 +1300 Merge pull request #112 from apache/feature/OPENMEETINGS-2470-supply-jetty-with-test-web-xml OPENMEETINGS-2470 Fix and remove filters while running in dev version. openmeetings-web/pom.xml| 1 + openmeetings-web/src/test/jetty/web.xml | 86 + 2 files changed, 87 insertions(+)
[openmeetings] branch feature/OPENMEETINGS-2470-supply-jetty-with-test-web-xml created (now 0dae53e)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2470-supply-jetty-with-test-web-xml in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 0dae53e OPENMEETINGS-2470 Fix and remove filters while running in dev version. This branch includes the following new commits: new 0dae53e OPENMEETINGS-2470 Fix and remove filters while running in dev version. 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.
[openmeetings] 01/01: OPENMEETINGS-2470 Fix and remove filters while running in dev version.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2470-supply-jetty-with-test-web-xml
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 0dae53e41c89e20721d13fa152ffe231685c6961
Author: Sebastian Wagner
AuthorDate: Fri Oct 2 16:29:43 2020 +1300
OPENMEETINGS-2470 Fix and remove filters while running in dev version.
---
openmeetings-web/pom.xml| 1 +
openmeetings-web/src/test/jetty/web.xml | 86 +
2 files changed, 87 insertions(+)
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 7b4b326..8734b46 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -554,6 +554,7 @@
/openmeetings
+
${project.basedir}/src/test/jetty/web.xml
${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml
diff --git a/openmeetings-web/src/test/jetty/web.xml
b/openmeetings-web/src/test/jetty/web.xml
new file mode 100644
index 000..1922c43
--- /dev/null
+++ b/openmeetings-web/src/test/jetty/web.xml
@@ -0,0 +1,86 @@
+
+
+http://xmlns.jcp.org/xml/ns/javaee;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;>
+
+ contextConfigLocation
+
/WEB-INF/classes/applicationContext.xml
+
+
+
org.apache.tomcat.websocket.textBufferSize
+ 1048576
+
+
+
org.apache.openmeetings.util.OMContextListener
+
+
+
+ OpenmeetingsApplication
+
org.apache.wicket.protocol.ws.javax.JavaxWebSocketFilter
+ true
+
+ applicationClassName
+
org.apache.openmeetings.web.app.Application
+
+
+ applicationFactoryClassName
+
org.apache.wicket.spring.SpringWebApplicationFactory
+
+
+ configuration
+ ${wicket.configuration}
+
+
+ ignorePaths
+
css,docs,images,js,persistence,public,screenshare,data,services
+
+
+
+ OpenmeetingsApplication
+ /*
+
+
+
+
org.springframework.web.context.ContextLoaderListener
+
+
+
+ CXFServlet
+
org.apache.cxf.transport.servlet.CXFServlet
+
+ config-location
+ classpath:cxf-servlet.xml
+
+ 1
+ true
+
+
+ CXFServlet
+ /services/*
+
+
+
+ inc
+ text/plain
+
+
+
[openmeetings] branch master updated (9ee4d4d -> cb13500)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 9ee4d4d [OPENMEETINGS-2433] DISTINCT is added to profile search add 11db48b OPENMEETINGS-2434 Add some logging to better find out what env variable has been picked up. add adc2ae5 OPENMEETINGS-2434 Move log outside if/-else block. add f045f64 OPENMEETINGS-2434 Move log outside if/-else block - move to end. new cb13500 Merge pull request #111 from apache/feature/OPENMEETINGS-2434-data-dir-logging 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: .../src/main/java/org/apache/openmeetings/util/OmFileHelper.java | 1 + 1 file changed, 1 insertion(+)
[openmeetings] 01/01: Merge pull request #111 from apache/feature/OPENMEETINGS-2434-data-dir-logging
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit cb1350067f82dff28c4c002626964cfc3083deb3 Merge: 9ee4d4d f045f64 Author: Sebastian Wagner AuthorDate: Tue Sep 15 07:35:00 2020 +1200 Merge pull request #111 from apache/feature/OPENMEETINGS-2434-data-dir-logging OPENMEETINGS-2434 Add some logging to better find out what env variable has been picked up. .../src/main/java/org/apache/openmeetings/util/OmFileHelper.java | 1 + 1 file changed, 1 insertion(+)
[openmeetings] branch feature/OPENMEETINGS-2434-data-dir-logging updated (adc2ae5 -> f045f64)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2434-data-dir-logging in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from adc2ae5 OPENMEETINGS-2434 Move log outside if/-else block. add f045f64 OPENMEETINGS-2434 Move log outside if/-else block - move to end. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/openmeetings/util/OmFileHelper.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[openmeetings] branch feature/OPENMEETINGS-2434-data-dir-logging updated (11db48b -> adc2ae5)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2434-data-dir-logging in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 11db48b OPENMEETINGS-2434 Add some logging to better find out what env variable has been picked up. add adc2ae5 OPENMEETINGS-2434 Move log outside if/-else block. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/openmeetings/util/OmFileHelper.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[openmeetings] branch feature/OPENMEETINGS-2434-data-dir-logging created (now 11db48b)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2434-data-dir-logging in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 11db48b OPENMEETINGS-2434 Add some logging to better find out what env variable has been picked up. This branch includes the following new commits: new 11db48b OPENMEETINGS-2434 Add some logging to better find out what env variable has been picked up. 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.
[openmeetings] 01/01: OPENMEETINGS-2434 Add some logging to better find out what env variable has been picked up.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch feature/OPENMEETINGS-2434-data-dir-logging
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 11db48be5576630492868c389ca87c59022911d2
Author: Sebastian Wagner
AuthorDate: Mon Sep 14 18:50:09 2020 +1200
OPENMEETINGS-2434 Add some logging to better find out what env variable has
been picked up.
---
.../src/main/java/org/apache/openmeetings/util/OmFileHelper.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
index 593c05f..a7c5ffc 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
@@ -104,6 +104,7 @@ public class OmFileHelper {
if (Strings.isEmpty(dataDir)) {
DATA_HOME = new File(OM_HOME, DATA_DIR);
} else {
+ log.info("Overwrite custom DATA_DIR: {}", dataDir);
DATA_HOME = new File(dataDir);
}
}
[openmeetings] 01/01: Merge pull request #107 from apache/feature/website-update-screenshot
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit ec35debd778def7ba021c1817a510bb68e5898f4 Merge: 7427163 3c85056 Author: Sebastian Wagner AuthorDate: Fri Aug 28 16:51:31 2020 +1200 Merge pull request #107 from apache/feature/website-update-screenshot No Jira - Website update screenshots. .../src/site/resources/images/cut_conference_room.png | Bin 171055 -> 0 bytes .../site/resources/images/cut_conference_room_om5.png | Bin 0 -> 209105 bytes openmeetings-server/src/site/xdoc/index.xml| 2 +- 3 files changed, 1 insertion(+), 1 deletion(-)
[openmeetings] branch master updated (7427163 -> ec35deb)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 7427163 [OPENMEETINGS-2419] dependencies and plugins are updated add 3c85056 No Jira - Website update screenshots. new ec35deb Merge pull request #107 from apache/feature/website-update-screenshot 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: .../src/site/resources/images/cut_conference_room.png | Bin 171055 -> 0 bytes .../site/resources/images/cut_conference_room_om5.png | Bin 0 -> 209105 bytes openmeetings-server/src/site/xdoc/index.xml| 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 openmeetings-server/src/site/resources/images/cut_conference_room.png create mode 100644 openmeetings-server/src/site/resources/images/cut_conference_room_om5.png
[openmeetings-site] 01/01: Merge pull request #4 from apache/feature/update-screenshot-conf-room
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git commit 490f864181bd3d7a3330eea41eb2cb416e1bfe3c Merge: 6ca2f4d 58ab27e Author: Sebastian Wagner AuthorDate: Fri Aug 28 16:39:07 2020 +1200 Merge pull request #4 from apache/feature/update-screenshot-conf-room Update screenshot conference room. images/cut_conference_room.png | Bin 171055 -> 0 bytes images/cut_conference_room_om5.png | Bin 0 -> 209105 bytes index.html | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-)
[openmeetings-site] branch asf-site updated (6ca2f4d -> 490f864)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git. from 6ca2f4d no jira: weird comment is removed add 58ab27e Update screenshot conference room. new 490f864 Merge pull request #4 from apache/feature/update-screenshot-conf-room 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: images/cut_conference_room.png | Bin 171055 -> 0 bytes images/cut_conference_room_om5.png | Bin 0 -> 209105 bytes index.html | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 images/cut_conference_room.png create mode 100644 images/cut_conference_room_om5.png
[openmeetings-site] 01/01: Update screenshot conference room.
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/update-screenshot-conf-room in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git commit 58ab27e377de03a76ebb44da96130bbd2036a56a Author: Sebastian Wagner AuthorDate: Fri Aug 28 16:37:41 2020 +1200 Update screenshot conference room. --- images/cut_conference_room.png | Bin 171055 -> 0 bytes images/cut_conference_room_om5.png | Bin 0 -> 209105 bytes index.html | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/cut_conference_room.png b/images/cut_conference_room.png deleted file mode 100644 index b062172..000 Binary files a/images/cut_conference_room.png and /dev/null differ diff --git a/images/cut_conference_room_om5.png b/images/cut_conference_room_om5.png new file mode 100644 index 000..87fbb1f Binary files /dev/null and b/images/cut_conference_room_om5.png differ diff --git a/index.html b/index.html index fb2768f..c0578f3 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ @@ -214,7 +214,7 @@ -Last Published: 2020-08-18 +Last Published: 2020-08-28 @@ -229,7 +229,7 @@ - + Audio/Video Conferencing OpenMeetings enables you to make Audio/Video conferencing.
[openmeetings-site] branch feature/update-screenshot-conf-room created (now 58ab27e)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/update-screenshot-conf-room in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git. at 58ab27e Update screenshot conference room. This branch includes the following new commits: new 58ab27e Update screenshot conference room. 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.
[openmeetings] 01/01: No Jira - Website update screenshots.
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/website-update-screenshot in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 3c850560be4f478765350f78c0899eff9d30609c Author: Sebastian Wagner AuthorDate: Fri Aug 28 16:33:36 2020 +1200 No Jira - Website update screenshots. --- .../src/site/resources/images/cut_conference_room.png | Bin 171055 -> 0 bytes .../site/resources/images/cut_conference_room_om5.png | Bin 0 -> 209105 bytes openmeetings-server/src/site/xdoc/index.xml| 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/openmeetings-server/src/site/resources/images/cut_conference_room.png b/openmeetings-server/src/site/resources/images/cut_conference_room.png deleted file mode 100644 index b062172..000 Binary files a/openmeetings-server/src/site/resources/images/cut_conference_room.png and /dev/null differ diff --git a/openmeetings-server/src/site/resources/images/cut_conference_room_om5.png b/openmeetings-server/src/site/resources/images/cut_conference_room_om5.png new file mode 100644 index 000..87fbb1f Binary files /dev/null and b/openmeetings-server/src/site/resources/images/cut_conference_room_om5.png differ diff --git a/openmeetings-server/src/site/xdoc/index.xml b/openmeetings-server/src/site/xdoc/index.xml index b32be10..95906d6 100644 --- a/openmeetings-server/src/site/xdoc/index.xml +++ b/openmeetings-server/src/site/xdoc/index.xml @@ -21,7 +21,7 @@ - + OpenMeetings enables you to make Audio/Video conferencing.
[openmeetings] branch feature/website-update-screenshot created (now 3c85056)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/website-update-screenshot in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 3c85056 No Jira - Website update screenshots. This branch includes the following new commits: new 3c85056 No Jira - Website update screenshots. 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.
[openmeetings-site] branch feature/update-build-instructions-javascript created (now 0c1955c)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/update-build-instructions-javascript in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git. at 0c1955c Update Build Instructions JavaScript. This branch includes the following new commits: new 0c1955c Update Build Instructions JavaScript. 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.
[openmeetings-site] 01/01: Update Build Instructions JavaScript.
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/update-build-instructions-javascript in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git commit 0c1955ca4e3b84feb2528e90e6be41723c0709e4 Author: Sebastian Wagner AuthorDate: Mon Aug 17 19:10:27 2020 +1200 Update Build Instructions JavaScript. --- BuildInstructions.html | 32 +--- index.html | 6 +++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/BuildInstructions.html b/BuildInstructions.html index de04ce1..66d1557 100644 --- a/BuildInstructions.html +++ b/BuildInstructions.html @@ -3,7 +3,7 @@ @@ -214,14 +214,14 @@ -Last Published: 2020-04-23 +Last Published: 2020-08-17 Nightly Builds - You can find Nightly Builds of the software at: https://builds.apache.org/view/M-R/view/OpenMeetings/; target="_blank" rel="nofollow"> https://builds.apache.org/view/M-R/view/OpenMeetings/ + You can find Nightly Builds of the software at: https://ci-builds.apache.org/job/OpenMeetings/; target="_blank" rel="nofollow"> https://ci-builds.apache.org/job/OpenMeetings/ How to Build a Distribution @@ -299,6 +299,26 @@ cd ..; mvn clean install -PallModules,quick,mysql -pl openmeetings-util,openmeet + + + Update JavaScript and CSS at runtime + + You can update Javascript and CSS files and then copy them at runtime. No need to re-run the entire Server build and restart. This can greatly save time when developing: + + mvn minify:minify@room-js minify:minify@interview-wb-js minify:minify@wb-js minify:minify@fileinput-js minify:minify@settings-js minify:minify@nettest-js minify:minify@chat-js minify:minify@theme-minify + + You can further trim down the compile time to just selected Javascript sections: + + mvn minify:minify@room-js minify:minify@interview-wb-js + + And then copy them into the relevant folder, for example if your run the Embedded Jetty: + + cp -R target/generated-sources/main/java/org/apache/openmeetings/* target/openmeetings-web-5.0.0-SNAPSHOT/WEB-INF/classes/org/apache/openmeetings/ + + + + + Fix Proxy settings Working behind a proxy: If you are sitting behind a proxy you should add some proxy settings before starting the build process. @@ -338,6 +358,12 @@ cd ..; mvn clean install -PallModules,quick,mysql -pl openmeetings-util,openmeet Tips and Gotchas + +Update JavaScript and CSS at runtime + + +Fix Proxy settings + diff --git a/index.html b/index.html index 6931d36..98a5e92 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ @@ -214,7 +214,7 @@ -Last Published: 2020-04-23 +Last Published: 2020-08-17 @@ -294,7 +294,7 @@ Apache OpenMeetings - Features and overview - Openmeetings provides video conferencing, instant messaging, white board, collaborative document editing and other groupware tools. It uses API functions of Media Server for Remoting and Streaming (Red5 or Kurento). + Openmeetings provides video conferencing, instant messaging, white board, collaborative document editing and other groupware tools. It uses API functions of Media Server for Remoting and Streaming Kurento. OpenMeetings is a project of the Apache, the old project website at http://code.google.com/p/openmeetings/; target="_blank">GoogleCode will receive no updates anymore. The website at Apache is the only place that receives updates.
[openmeetings-site] branch feature/update-build-instructions created (now aa7bed1)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/update-build-instructions in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git. at aa7bed1 Update build instructions. This branch includes the following new commits: new aa7bed1 Update build instructions. 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.
[openmeetings-site] 01/01: Update build instructions.
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/update-build-instructions in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git commit aa7bed12909f4d3c9cb415853878e93bebe99e9b Author: Sebastian Wagner AuthorDate: Mon Aug 17 19:04:13 2020 +1200 Update build instructions. --- BuildInstructions.html | 32 +--- index.html | 46 ++ 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/BuildInstructions.html b/BuildInstructions.html index ffc94e6..66d1557 100644 --- a/BuildInstructions.html +++ b/BuildInstructions.html @@ -3,7 +3,7 @@ @@ -214,14 +214,14 @@ -Last Published: 2020-04-11 +Last Published: 2020-08-17 Nightly Builds - You can find Nightly Builds of the software at: https://builds.apache.org/view/M-R/view/OpenMeetings/; target="_blank" rel="nofollow"> https://builds.apache.org/view/M-R/view/OpenMeetings/ + You can find Nightly Builds of the software at: https://ci-builds.apache.org/job/OpenMeetings/; target="_blank" rel="nofollow"> https://ci-builds.apache.org/job/OpenMeetings/ How to Build a Distribution @@ -299,6 +299,26 @@ cd ..; mvn clean install -PallModules,quick,mysql -pl openmeetings-util,openmeet + + + Update JavaScript and CSS at runtime + + You can update Javascript and CSS files and then copy them at runtime. No need to re-run the entire Server build and restart. This can greatly save time when developing: + + mvn minify:minify@room-js minify:minify@interview-wb-js minify:minify@wb-js minify:minify@fileinput-js minify:minify@settings-js minify:minify@nettest-js minify:minify@chat-js minify:minify@theme-minify + + You can further trim down the compile time to just selected Javascript sections: + + mvn minify:minify@room-js minify:minify@interview-wb-js + + And then copy them into the relevant folder, for example if your run the Embedded Jetty: + + cp -R target/generated-sources/main/java/org/apache/openmeetings/* target/openmeetings-web-5.0.0-SNAPSHOT/WEB-INF/classes/org/apache/openmeetings/ + + + + + Fix Proxy settings Working behind a proxy: If you are sitting behind a proxy you should add some proxy settings before starting the build process. @@ -338,6 +358,12 @@ cd ..; mvn clean install -PallModules,quick,mysql -pl openmeetings-util,openmeet Tips and Gotchas + +Update JavaScript and CSS at runtime + + +Fix Proxy settings + diff --git a/index.html b/index.html index bc6f287..98a5e92 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ @@ -214,7 +214,7 @@ -Last Published: 2020-04-11 +Last Published: 2020-08-17 @@ -294,7 +294,7 @@ Apache OpenMeetings - Features and overview - Openmeetings provides video conferencing, instant messaging, white board, collaborative document editing and other groupware tools. It uses API functions of Media Server for Remoting and Streaming (Red5 or Kurento). + Openmeetings provides video conferencing, instant messaging, white board, collaborative document editing and other groupware tools. It uses API functions of Media Server for Remoting and Streaming Kurento. OpenMeetings is a project of the Apache, the old project website at http://code.google.com/p/openmeetings/; target="_blank">GoogleCode will receive no updates anymore. The website at Apache is the only place that receives updates. @@ -302,9 +302,9 @@ -Version 5.0.0-M3 released! +Version 5.0.0-M4 released! - Release 5.0.0-M3, provides following improvements: + Release 5.0.0-M4, provides following improvements: This release provides WebRTC audio/video/screen-sharing in the Room Flash plugin is no more required in the browser @@ -312,29 +312,35 @@ Please NOTE: this version might be not production ready IMPORTANT: Java 11 is required - Backup/Restore: + UI: - Multiple issues with restore were fixed - Confirmation of backup import was added - File/recording hashes are preserved when possible - White board: + Main UI library has been changed Jquery-UI - Bootstrap + Hotkey to resizearrage "video" windows is added + Camera/Microphone on/off icons are less confusing + The room can be blocked until moderator will enter + Room sidebar dock button works as expected + Right-click menu for WB tab
[openmeetings-site] branch feature/update-build-instructions created (now aa7bed1)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/update-build-instructions in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git. at aa7bed1 Update build instructions. This branch includes the following new commits: new aa7bed1 Update build instructions. 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.
[openmeetings-site] 01/01: Update build instructions.
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/update-build-instructions in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git commit aa7bed12909f4d3c9cb415853878e93bebe99e9b Author: Sebastian Wagner AuthorDate: Mon Aug 17 19:04:13 2020 +1200 Update build instructions. --- BuildInstructions.html | 32 +--- index.html | 46 ++ 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/BuildInstructions.html b/BuildInstructions.html index ffc94e6..66d1557 100644 --- a/BuildInstructions.html +++ b/BuildInstructions.html @@ -3,7 +3,7 @@ @@ -214,14 +214,14 @@ -Last Published: 2020-04-11 +Last Published: 2020-08-17 Nightly Builds - You can find Nightly Builds of the software at: https://builds.apache.org/view/M-R/view/OpenMeetings/; target="_blank" rel="nofollow"> https://builds.apache.org/view/M-R/view/OpenMeetings/ + You can find Nightly Builds of the software at: https://ci-builds.apache.org/job/OpenMeetings/; target="_blank" rel="nofollow"> https://ci-builds.apache.org/job/OpenMeetings/ How to Build a Distribution @@ -299,6 +299,26 @@ cd ..; mvn clean install -PallModules,quick,mysql -pl openmeetings-util,openmeet + + + Update JavaScript and CSS at runtime + + You can update Javascript and CSS files and then copy them at runtime. No need to re-run the entire Server build and restart. This can greatly save time when developing: + + mvn minify:minify@room-js minify:minify@interview-wb-js minify:minify@wb-js minify:minify@fileinput-js minify:minify@settings-js minify:minify@nettest-js minify:minify@chat-js minify:minify@theme-minify + + You can further trim down the compile time to just selected Javascript sections: + + mvn minify:minify@room-js minify:minify@interview-wb-js + + And then copy them into the relevant folder, for example if your run the Embedded Jetty: + + cp -R target/generated-sources/main/java/org/apache/openmeetings/* target/openmeetings-web-5.0.0-SNAPSHOT/WEB-INF/classes/org/apache/openmeetings/ + + + + + Fix Proxy settings Working behind a proxy: If you are sitting behind a proxy you should add some proxy settings before starting the build process. @@ -338,6 +358,12 @@ cd ..; mvn clean install -PallModules,quick,mysql -pl openmeetings-util,openmeet Tips and Gotchas + +Update JavaScript and CSS at runtime + + +Fix Proxy settings + diff --git a/index.html b/index.html index bc6f287..98a5e92 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ @@ -214,7 +214,7 @@ -Last Published: 2020-04-11 +Last Published: 2020-08-17 @@ -294,7 +294,7 @@ Apache OpenMeetings - Features and overview - Openmeetings provides video conferencing, instant messaging, white board, collaborative document editing and other groupware tools. It uses API functions of Media Server for Remoting and Streaming (Red5 or Kurento). + Openmeetings provides video conferencing, instant messaging, white board, collaborative document editing and other groupware tools. It uses API functions of Media Server for Remoting and Streaming Kurento. OpenMeetings is a project of the Apache, the old project website at http://code.google.com/p/openmeetings/; target="_blank">GoogleCode will receive no updates anymore. The website at Apache is the only place that receives updates. @@ -302,9 +302,9 @@ -Version 5.0.0-M3 released! +Version 5.0.0-M4 released! - Release 5.0.0-M3, provides following improvements: + Release 5.0.0-M4, provides following improvements: This release provides WebRTC audio/video/screen-sharing in the Room Flash plugin is no more required in the browser @@ -312,29 +312,35 @@ Please NOTE: this version might be not production ready IMPORTANT: Java 11 is required - Backup/Restore: + UI: - Multiple issues with restore were fixed - Confirmation of backup import was added - File/recording hashes are preserved when possible - White board: + Main UI library has been changed Jquery-UI - Bootstrap + Hotkey to resizearrage "video" windows is added + Camera/Microphone on/off icons are less confusing + The room can be blocked until moderator will enter + Room sidebar dock button works as expected + Right-click menu for WB tab
[openmeetings] 01/01: Merge pull request #105 from apache/feature/update-javascript-and-build-instructions
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 8ebfec88959448843936155a74bb86b63226ed82 Merge: 4a5e199 bd8f7b0 Author: Sebastian Wagner AuthorDate: Mon Aug 17 19:03:46 2020 +1200 Merge pull request #105 from apache/feature/update-javascript-and-build-instructions Update Javascript and Build Instructions. openmeetings-server/src/site/xdoc/BuildInstructions.xml | 13 + 1 file changed, 13 insertions(+)
[openmeetings] branch master updated (4a5e199 -> 8ebfec8)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 4a5e199 release preparation: documentation update add 84a6522 Update Javascript and Build Instructions. add e81ccb4 Reword some typos. add bd8f7b0 Rename to previous section heading. new 8ebfec8 Merge pull request #105 from apache/feature/update-javascript-and-build-instructions 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: openmeetings-server/src/site/xdoc/BuildInstructions.xml | 13 + 1 file changed, 13 insertions(+)
[openmeetings] branch feature/update-javascript-and-build-instructions updated (e81ccb4 -> bd8f7b0)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/update-javascript-and-build-instructions in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from e81ccb4 Reword some typos. add bd8f7b0 Rename to previous section heading. No new revisions were added by this update. Summary of changes: openmeetings-server/src/site/xdoc/BuildInstructions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[openmeetings] branch feature/update-javascript-and-build-instructions updated (84a6522 -> e81ccb4)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/update-javascript-and-build-instructions in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 84a6522 Update Javascript and Build Instructions. add e81ccb4 Reword some typos. No new revisions were added by this update. Summary of changes: openmeetings-server/src/site/xdoc/BuildInstructions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[openmeetings] 01/01: Update Javascript and Build Instructions.
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/update-javascript-and-build-instructions in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 84a6522e9304d55090808358b43a4a8d19384686 Author: Sebastian Wagner AuthorDate: Mon Aug 17 18:36:22 2020 +1200 Update Javascript and Build Instructions. --- openmeetings-server/src/site/xdoc/BuildInstructions.xml | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml b/openmeetings-server/src/site/xdoc/BuildInstructions.xml index 41adef7..2eab1d4 100644 --- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml +++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml @@ -60,7 +60,7 @@ mvn org.apache.maven.plugins:maven-dependency-plugin:analyze-only - + Eclipse ANSI colors plugin for colors in console + + + + + You can update the selected the Javascript and CSS files and then copy them at runtime. No need to re-run the entire Server build and restart. This can greatly save time when developing: + mvn minify:minify@room-js minify:minify@interview-wb-js minify:minify@wb-js minify:minify@fileinput-js minify:minify@settings-js minify:minify@nettest-js minify:minify@chat-js minify:minify@theme-minify + You can further trim down the compile time to just selected Javascript sections: + mvn minify:minify@room-js minify:minify@interview-wb-js + And then copy them into the relevant folder, for example if your run the Embedded Jetty: + cp -R target/generated-sources/main/java/org/apache/openmeetings/* target/openmeetings-web-5.0.0-SNAPSHOT/WEB-INF/classes/org/apache/openmeetings/ + + + Working behind a proxy: If you are sitting behind a proxy you should add some proxy settings before starting the build process.
[openmeetings] branch feature/update-javascript-and-build-instructions created (now 84a6522)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/update-javascript-and-build-instructions in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 84a6522 Update Javascript and Build Instructions. This branch includes the following new commits: new 84a6522 Update Javascript and Build Instructions. 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.
[openmeetings] branch master updated (600e5d0 -> 09edea9)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 600e5d0 [OPENMEETINGS-2296] wicketstuff, commons-lang3 and jetty are updated add a3c1939 OPENMEETINGS-2411 Fix Nullpointer on startup. new 09edea9 Merge pull request #101 from apache/feature/OPENMEETINGS-2411-fix-nullpointer-on-startup 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: .../main/java/org/apache/openmeetings/util/OMContextListener.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[openmeetings] 01/01: Merge pull request #101 from apache/feature/OPENMEETINGS-2411-fix-nullpointer-on-startup
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 09edea9cd91bf06b0a7ddc820e123bb90d438027 Merge: 600e5d0 a3c1939 Author: Sebastian Wagner AuthorDate: Mon Jul 27 09:09:24 2020 +1200 Merge pull request #101 from apache/feature/OPENMEETINGS-2411-fix-nullpointer-on-startup OPENMEETINGS-2411 Fix Nullpointer on startup. .../main/java/org/apache/openmeetings/util/OMContextListener.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2411-fix-nullpointer-on-startup created (now a3c1939)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2411-fix-nullpointer-on-startup in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at a3c1939 OPENMEETINGS-2411 Fix Nullpointer on startup. No new revisions were added by this update.
[openmeetings] 01/01: Trial update of kurento utils.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch feature/update-kurento-utils-js
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 832b02f35d53cef5ff873ba16d46442ff4673d3a
Author: Sebastian Wagner
AuthorDate: Sat Jun 13 13:36:34 2020 +1200
Trial update of kurento utils.
---
.../apache/openmeetings/web/room/kurento-utils.js | 2434 +---
1 file changed, 1115 insertions(+), 1319 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
index ce5bb19..5235508 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
@@ -1,1468 +1,1264 @@
(function(f){if(typeof exports==="object"&
module!=="undefined"){module.exports=f()}else if(typeof
define==="function"&){define([],f)}else{var g;if(typeof
window!=="undefined"){g=window}else if(typeof
global!=="undefined"){g=global}else if(typeof
self!=="undefined"){g=self}else{g=this}g.kurentoUtils = f()}})(function(){var
define,module,exports;return (function(){function r(e,n,t){function
o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof
require&if(!f&)ret [...]
-var freeice = require('freeice');
-var inherits = require('inherits');
-var UAParser = require('ua-parser-js');
-window.uuidv4 = require('uuid/v4');
-var hark = require('hark');
-var EventEmitter = require('events').EventEmitter;
-var recursive = require('merge').recursive.bind(undefined, true);
-var sdpTranslator = require('sdp-translator');
-var logger = window.Logger || console;
-try {
-require('kurento-browser-extensions');
-} catch (error) {
-if (typeof getScreenConstraints === 'undefined') {
-logger.warn('screen sharing is not available');
-getScreenConstraints = function getScreenConstraints(sendSource,
callback) {
-callback(new Error('This library is not enabled for screen
sharing'));
-};
-}
-}
-var MEDIA_CONSTRAINTS = {
-audio: true,
-video: {
-width: 640,
-framerate: 15
-}
-};
-var ua = window && window.navigator ? window.navigator.userAgent : '';
-var parser = new UAParser(ua);
-var browser = parser.getBrowser();
-var usePlanB = false;
-if (browser.name === 'Chrome' || browser.name === 'Chromium') {
-logger.debug(browser.name + ': using SDP PlanB');
-usePlanB = true;
-}
-function noop(error) {
-if (error)
-logger.error(error);
-}
-function trackStop(track) {
-track.stop && track.stop();
-}
-function streamStop(stream) {
-stream.getTracks().forEach(trackStop);
-}
-var dumpSDP = function (description) {
-if (typeof description === 'undefined' || description === null) {
-return '';
+require('kurento-utils')
+{}
+
+},{"kurento-utils":9}],2:[function(require,module,exports){
+/* jshint node: true */
+'use strict';
+
+var normalice = require('normalice');
+
+/**
+ # freeice
+
+ The `freeice` module is a simple way of getting random STUN or TURN server
+ for your WebRTC application. The list of servers (just STUN at this stage)
+ were sourced from this [gist](https://gist.github.com/zziuni/3741933).
+
+ ## Example Use
+
+ The following demonstrates how you can use `freeice` with
+ [rtc-quickconnect](https://github.com/rtc-io/rtc-quickconnect):
+
+ <<< examples/quickconnect.js
+
+ As the `freeice` module generates ice servers in a list compliant with the
+ WebRTC spec you will be able to use it with raw `RTCPeerConnection`
+ constructors and other WebRTC libraries.
+
+ ## Hey, don't use my STUN/TURN server!
+
+ If for some reason your free STUN or TURN server ends up in the
+ list of servers
([stun](https://github.com/DamonOehlman/freeice/blob/master/stun.json) or
+ [turn](https://github.com/DamonOehlman/freeice/blob/master/turn.json))
+ that is used in this module, you can feel
+ free to open an issue on this repository and those servers will be removed
+ within 24 hours (or sooner). This is the quickest and probably the most
+ polite way to have something removed (and provides us some visibility
+ if someone opens a pull request requesting that a server is added).
+
+ ## Please add my server!
+
+ If you have a server that you wish to add to the list, that's awesome! I'm
+ sure I speak on behalf of a whole pile of WebRTC developers who say thanks.
+ To get it into the list, feel free to either open a pull request or if you
+ find that process a bit daunting then just create an issue requesting
+ the addition of the server (make sure you provide all the details, and if
+ you have a Terms of Service then including that in the PR/issue would be
+ aweso
[openmeetings] branch feature/update-kurento-utils-js created (now 832b02f)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/update-kurento-utils-js in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 832b02f Trial update of kurento utils. This branch includes the following new commits: new 832b02f Trial update of kurento utils. 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.
[openmeetings] 01/01: Merge pull request #94 from apache/feature/OPENMEETINGS-2356-move-close-icon-for-download-dialog
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit d29c76ad70620c236920470666d98ea78c9a1ad1 Merge: bbef5ff b502a54 Author: Sebastian Wagner AuthorDate: Thu May 21 20:56:55 2020 +1200 Merge pull request #94 from apache/feature/OPENMEETINGS-2356-move-close-icon-for-download-dialog OPENMEETINGS-2356 Move close icon on top of ui-titlebar so that mobile and touch can click it .../src/main/java/org/apache/openmeetings/web/common/main.js | 5 + .../src/main/java/org/apache/openmeetings/web/room/raw-sharer.js | 5 + .../src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js | 1 + openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-)
[openmeetings] branch master updated (bbef5ff -> d29c76a)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from bbef5ff [OPENMEETINGS-2368] improvements for ICE parameters (#92) add 4243c86 OPENMEETINGS-2356 Move close icon on top of ui-titlebar so that mobile/touch can click it. add 14b8f01 OPENMEETINGS-2356 Fix common method and indentation in CSS. add b502a54 Merge branch 'master' into feature/OPENMEETINGS-2356-move-close-icon-for-download-dialog new d29c76a Merge pull request #94 from apache/feature/OPENMEETINGS-2356-move-close-icon-for-download-dialog 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: .../src/main/java/org/apache/openmeetings/web/common/main.js | 5 + .../src/main/java/org/apache/openmeetings/web/room/raw-sharer.js | 5 + .../src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js | 1 + openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2356-move-close-icon-for-download-dialog updated (4243c86 -> b502a54)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2356-move-close-icon-for-download-dialog in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 4243c86 OPENMEETINGS-2356 Move close icon on top of ui-titlebar so that mobile/touch can click it. add 14b8f01 OPENMEETINGS-2356 Fix common method and indentation in CSS. add a230f8a [OPENMEETINGS-2366] add ability to disable CSP headers (#93) add bbef5ff [OPENMEETINGS-2368] improvements for ICE parameters (#92) add b502a54 Merge branch 'master' into feature/OPENMEETINGS-2356-move-close-icon-for-download-dialog No new revisions were added by this update. Summary of changes: .../org/apache/openmeetings/core/remote/KRoom.java | 4 ++-- .../apache/openmeetings/core/remote/KStream.java | 2 +- .../openmeetings/core/remote/KurentoHandler.java | 26 -- .../openmeetings/core/remote/StreamProcessor.java | 2 +- .../core/remote/TestStreamProcessor.java | 4 ++-- .../db/dao/basic/ConfigurationDao.java | 13 +++ .../installation/ImportInitvalues.java | 2 ++ .../openmeetings/util/OpenmeetingsVariables.java | 1 + .../java/org/apache/openmeetings/util/Version.java | 2 +- .../org/apache/openmeetings/web/common/main.js | 5 + .../apache/openmeetings/web/room/RoomPanel.java| 2 +- .../org/apache/openmeetings/web/room/raw-sharer.js | 5 + .../apache/openmeetings/web/room/wb/raw-wb-area.js | 5 + .../src/main/webapp/css/theme_om/jquery-ui.css | 2 +- 14 files changed, 51 insertions(+), 24 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2356-move-close-icon-for-download-dialog created (now 4243c86)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2356-move-close-icon-for-download-dialog in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 4243c86 OPENMEETINGS-2356 Move close icon on top of ui-titlebar so that mobile/touch can click it. This branch includes the following new commits: new 4243c86 OPENMEETINGS-2356 Move close icon on top of ui-titlebar so that mobile/touch can click it. 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.
[openmeetings] 01/01: OPENMEETINGS-2356 Move close icon on top of ui-titlebar so that mobile/touch can click it.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2356-move-close-icon-for-download-dialog
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 4243c861f528b4cc353baf0ff39a7da1804b1788
Author: Sebastian Wagner
AuthorDate: Wed May 20 09:17:33 2020 +1200
OPENMEETINGS-2356 Move close icon on top of ui-titlebar so that
mobile/touch can click it.
---
.../src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js | 4
openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
index 0770af9..6f0972f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
@@ -411,6 +411,10 @@ var DrawWbArea = function() {
width: 350
, appendTo: '.room-block .wb-block'
});
+ // Fix to move the close icon on top of the
.ui-dialog-titlebar cause otherwise
+ // touch-events are broken and you won't be
able to close the dialog
+
dlg.parent().find('.ui-dialog-titlebar-close').appendTo(dlg.parent());
+
} catch (e) {
console.error(e);
}
diff --git a/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css
b/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css
index 6a4fd6a..cbfa1c7 100644
--- a/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css
+++ b/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui.css
@@ -595,8 +595,8 @@ button.ui-button::-moz-focus-inner {
}
.ui-dialog .ui-dialog-titlebar-close {
position: absolute;
- right: .3em;
- top: 50%;
+ right: 10px;
+top: 20px;
width: 20px;
margin: -10px 0 0 0;
padding: 1px;
[openmeetings] branch master updated (788fe99 -> 0be4245)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 788fe99 Merge pull request #91 from apache/feature/OPENMEETINGS-2360-fix-settings-dialog-touch-surface add 8033bb8 OPENMEETINGS-2308 Re-add accidently merged out of the code CSS from my video-pod buttons fix. new 0be4245 Merge pull request #90 from apache/feature/OPENMEETINGS-2308-fix-merge-issue-with-css 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: openmeetings-web/src/main/webapp/css/raw-room.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[openmeetings] 01/01: Merge pull request #90 from apache/feature/OPENMEETINGS-2308-fix-merge-issue-with-css
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 0be4245b9fde8865e0d68d0f67a081fc1f8448d1 Merge: 788fe99 8033bb8 Author: Sebastian Wagner AuthorDate: Tue May 19 12:57:04 2020 +1200 Merge pull request #90 from apache/feature/OPENMEETINGS-2308-fix-merge-issue-with-css OPENMEETINGS-2308 Re-add accidentally merged out of the code CSS from video pod fix openmeetings-web/src/main/webapp/css/raw-room.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[openmeetings] branch master updated (52cae0f -> 788fe99)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 52cae0f [OPENMEETINGS-2355] listeners are cleaned-up add 5bf5833 OPENMEETINGS-2360 Fix draggable on ui-titlebar and button to close outside of it. new 788fe99 Merge pull request #91 from apache/feature/OPENMEETINGS-2360-fix-settings-dialog-touch-surface 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: .../main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 10 +- .../java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 1 + 2 files changed, 6 insertions(+), 5 deletions(-)
[openmeetings] 01/01: Merge pull request #91 from apache/feature/OPENMEETINGS-2360-fix-settings-dialog-touch-surface
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 788fe99591dd933f7424c942363133b130cc271c Merge: 52cae0f 5bf5833 Author: Sebastian Wagner AuthorDate: Tue May 19 12:56:39 2020 +1200 Merge pull request #91 from apache/feature/OPENMEETINGS-2360-fix-settings-dialog-touch-surface OPENMEETINGS-2360 Fix draggable on ui-titlebar and button to close outside of it .../main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 10 +- .../java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 1 + 2 files changed, 6 insertions(+), 5 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2360-fix-settings-dialog-touch-surface created (now 5bf5833)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2360-fix-settings-dialog-touch-surface in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 5bf5833 OPENMEETINGS-2360 Fix draggable on ui-titlebar and button to close outside of it. This branch includes the following new commits: new 5bf5833 OPENMEETINGS-2360 Fix draggable on ui-titlebar and button to close outside of it. 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.
[openmeetings] 01/01: OPENMEETINGS-2360 Fix draggable on ui-titlebar and button to close outside of it.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2360-fix-settings-dialog-touch-surface
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 5bf583350b22fef587328760d1ef71bc7d9f504b
Author: Sebastian Wagner
AuthorDate: Tue May 19 09:15:05 2020 +1200
OPENMEETINGS-2360 Fix draggable on ui-titlebar and button to close outside
of it.
---
.../main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 10 +-
.../java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index 95ad14d..dee65c8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -163,12 +163,12 @@
-
-
-
-
-
+
+
+
+
+
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index 7193bbc..dd8426b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -242,6 +242,7 @@ var Wb = function() {
});
settings.draggable({
scroll: false
+ , handle: '.ui-dialog-titlebar'
, containment: 'body'
, start: function() {
if (!!settings.css('bottom')) {
[openmeetings] branch feature/OPENMEETINGS-2308-fix-merge-issue-with-css created (now 8033bb8)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2308-fix-merge-issue-with-css in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 8033bb8 OPENMEETINGS-2308 Re-add accidently merged out of the code CSS from my video-pod buttons fix. This branch includes the following new commits: new 8033bb8 OPENMEETINGS-2308 Re-add accidently merged out of the code CSS from my video-pod buttons fix. 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.
[openmeetings] 01/01: OPENMEETINGS-2308 Re-add accidently merged out of the code CSS from my video-pod buttons fix.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2308-fix-merge-issue-with-css
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 8033bb892e0acfe86103e275664a9698152f2922
Author: Sebastian Wagner
AuthorDate: Tue May 19 08:51:49 2020 +1200
OPENMEETINGS-2308 Re-add accidently merged out of the code CSS from my
video-pod buttons fix.
---
openmeetings-web/src/main/webapp/css/raw-room.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 36c0c68..78cf7af 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -432,7 +432,8 @@ html[dir="rtl"] .room-block .sb-wb .sidebar {
position: absolute;
top: 20px
}
-.user-video .ui-dialog-titlebar .buttonpane {
+.user-video .buttonpane {
+ background-color: var(--white);
position: absolute;
right: 2px;
top: 2px
[openmeetings] 01/01: Merge pull request #89 from apache/feature/OPENMEETINGS-2357-fix-math-dialog-to-apply-handle-for-draggable
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit c0a2defabbe6255deb296c35247765f235d846a6 Merge: e63c565 3e36e24 Author: Sebastian Wagner AuthorDate: Mon May 18 19:11:29 2020 +1200 Merge pull request #89 from apache/feature/OPENMEETINGS-2357-fix-math-dialog-to-apply-handle-for-draggable OPENMEETINGS-2357 Add handle for draggable and move close icon outside titlebar .../main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 10 +- .../java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-)
[openmeetings] branch master updated (e63c565 -> c0a2def)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from e63c565 [OPENMEETINGS-2359] check if data is available (#88) add 3e36e24 OPENMEETINGS-2357 Add handle for draggable and move close icon outside of titlebar. new c0a2def Merge pull request #89 from apache/feature/OPENMEETINGS-2357-fix-math-dialog-to-apply-handle-for-draggable 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: .../main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 10 +- .../java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-)
[openmeetings] 01/01: OPENMEETINGS-2357 Add handle for draggable and move close icon outside of titlebar.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2357-fix-math-dialog-to-apply-handle-for-draggable
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 3e36e24a82b4759be1ce1bae2613c8deea63e874
Author: Sebastian Wagner
AuthorDate: Mon May 18 08:11:34 2020 +1200
OPENMEETINGS-2357 Add handle for draggable and move close icon outside of
titlebar.
---
.../main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 10 +-
.../java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index 81ba3c2..95ad14d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -195,12 +195,12 @@
-
-
-
-
-
+
+
+
+
+
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index 30c1cec..7193bbc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -351,6 +351,7 @@ var Wb = function() {
}).parent().css('text-align', Settings.isRtl ?
'left' : 'right');
math.draggable({
scroll: false
+ , handle: '.ui-dialog-titlebar'
, containment: 'body'
, start: function() {
if (!!math.css('bottom')) {
@@ -362,7 +363,8 @@ var Wb = function() {
return false;
}
}
- }).resizable({
+ });
+ math.resizable({
alsoResize: math.find('.text-container')
});
case NONE:
[openmeetings] branch feature/OPENMEETINGS-2357-fix-math-dialog-to-apply-handle-for-draggable created (now 3e36e24)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2357-fix-math-dialog-to-apply-handle-for-draggable in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 3e36e24 OPENMEETINGS-2357 Add handle for draggable and move close icon outside of titlebar. This branch includes the following new commits: new 3e36e24 OPENMEETINGS-2357 Add handle for draggable and move close icon outside of titlebar. 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.
[openmeetings] 01/01: Merge pull request #87 from apache/feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 3a4f5c2eb5bc06d2b4559bbea816ed2d3a4ef663 Merge: f4809e5 15fc0ac Author: Sebastian Wagner AuthorDate: Sun May 17 09:17:49 2020 +1200 Merge pull request #87 from apache/feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top OPENMEETINGS-2339 Fix sharer window for touch surface close icon clone. .../src/main/java/org/apache/openmeetings/web/room/raw-sharer.js | 5 + openmeetings-web/src/main/webapp/css/raw-room.css | 7 +-- 2 files changed, 10 insertions(+), 2 deletions(-)
[openmeetings] branch master updated (f4809e5 -> 3a4f5c2)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from f4809e5 Merge pull request #86 from apache/feature/OPENMEETINGS-2339-cannot-click-close-icon-on-touch-surface-for-jquery-ui-draggable-window add fdf7fee OPENMEETINGS-2339 Fix sharer window for touch surface close icon clone. add ddde919 OPENMEETINGS-2339 Simplify fix for moving button on top of draggable ui-titlebar. add e4f034a OPENMEETINGS-2339 Fix missing JS end semicolon add 15fc0ac Merge branch 'master' into feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top new 3a4f5c2 Merge pull request #87 from apache/feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top 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: .../src/main/java/org/apache/openmeetings/web/room/raw-sharer.js | 5 + openmeetings-web/src/main/webapp/css/raw-room.css | 7 +-- 2 files changed, 10 insertions(+), 2 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top updated (e4f034a -> 15fc0ac)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from e4f034a OPENMEETINGS-2339 Fix missing JS end semicolon add 2c0e4df OPENMEETINGS-2339 Fix issue around icons hidden behind dragging element for video-pod. add f4809e5 Merge pull request #86 from apache/feature/OPENMEETINGS-2339-cannot-click-close-icon-on-touch-surface-for-jquery-ui-draggable-window add 15fc0ac Merge branch 'master' into feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/openmeetings/web/room/raw-video.js | 2 +- openmeetings-web/src/main/webapp/css/raw-room.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top updated (ddde919 -> e4f034a)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from ddde919 OPENMEETINGS-2339 Simplify fix for moving button on top of draggable ui-titlebar. add e4f034a OPENMEETINGS-2339 Fix missing JS end semicolon No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/openmeetings/web/room/raw-sharer.js| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[openmeetings] branch feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top updated (fdf7fee -> ddde919)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from fdf7fee OPENMEETINGS-2339 Fix sharer window for touch surface close icon clone. add ddde919 OPENMEETINGS-2339 Simplify fix for moving button on top of draggable ui-titlebar. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/openmeetings/web/room/raw-sharer.js | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-)
[openmeetings] 01/01: Merge pull request #86 from apache/feature/OPENMEETINGS-2339-cannot-click-close-icon-on-touch-surface-for-jquery-ui-draggable-window
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit f4809e591305e53c628bf0c088f10e23a92cead3 Merge: 5b48b7c 2c0e4df Author: Sebastian Wagner AuthorDate: Sun May 17 08:01:25 2020 +1200 Merge pull request #86 from apache/feature/OPENMEETINGS-2339-cannot-click-close-icon-on-touch-surface-for-jquery-ui-draggable-window OPENMEETINGS-2339 Fix issue around icons hidden behind drag for video pod .../src/main/java/org/apache/openmeetings/web/room/raw-video.js | 2 +- openmeetings-web/src/main/webapp/css/raw-room.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[openmeetings] branch master updated (5b48b7c -> f4809e5)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 5b48b7c [OPENMEETINGS-2349] new chromium-edge detection method and fixes (#85) add 2c0e4df OPENMEETINGS-2339 Fix issue around icons hidden behind dragging element for video-pod. new f4809e5 Merge pull request #86 from apache/feature/OPENMEETINGS-2339-cannot-click-close-icon-on-touch-surface-for-jquery-ui-draggable-window 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: .../src/main/java/org/apache/openmeetings/web/room/raw-video.js | 2 +- openmeetings-web/src/main/webapp/css/raw-room.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[openmeetings] 01/01: OPENMEETINGS-2339 Fix sharer window for touch surface close icon clone.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit fdf7feea0ff8452df91ef7220ac2dfaac6fe06eb
Author: Sebastian Wagner
AuthorDate: Sat May 16 22:19:39 2020 +1200
OPENMEETINGS-2339 Fix sharer window for touch surface close icon clone.
---
.../main/java/org/apache/openmeetings/web/room/raw-sharer.js | 10 ++
openmeetings-web/src/main/webapp/css/raw-room.css | 4
2 files changed, 14 insertions(+)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js
index ce89b6d..4ae4334 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js
@@ -26,6 +26,16 @@ var Sharer = (function() {
, autoOpen: false
, resizable: false
});
+
+ // Fix to move the close icon on top of the .ui-dialog-titlebar
cause otherwise
+ // touch-events are broken and you won't be able to close the
dialog
+ var closeIcon =
sharer.parent().find('.ui-dialog-titlebar-close').clone();
+ sharer.parent().append(closeIcon);
+
sharer.parent().find('.ui-dialog-titlebar-close').first().remove();
+
sharer.parent().find('.ui-dialog-titlebar-close').click(function() {
+ sharer.dialog('close');
+ });
+
if (!VideoUtil.sharingSupported()) {
sharer.find('.container').remove();
sharer.find('.alert').show();
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 2aea7c6..7d2596c 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -429,6 +429,10 @@ html[dir="rtl"] .room-block .sb-wb .sidebar {
{
background-color: var(--white);
}
+.sharer .ui-dialog-titlebar-close {
+ position: absolute;
+ top: 20px
+}
.user-video .ui-dialog-titlebar .buttonpane {
position: absolute;
right: 2px;
[openmeetings] branch feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top created (now fdf7fee)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2339-update-sharer-dialog-move-close-button-on-top in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at fdf7fee OPENMEETINGS-2339 Fix sharer window for touch surface close icon clone. This branch includes the following new commits: new fdf7fee OPENMEETINGS-2339 Fix sharer window for touch surface close icon clone. 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.
[openmeetings] branch feature/OPENMEETINGS-2339-cannot-click-close-icon-on-touch-surface-for-jquery-ui-draggable-window created (now 2c0e4df)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2339-cannot-click-close-icon-on-touch-surface-for-jquery-ui-draggable-window in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 2c0e4df OPENMEETINGS-2339 Fix issue around icons hidden behind dragging element for video-pod. This branch includes the following new commits: new 2c0e4df OPENMEETINGS-2339 Fix issue around icons hidden behind dragging element for video-pod. 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.
[openmeetings] 01/01: OPENMEETINGS-2339 Fix issue around icons hidden behind dragging element for video-pod.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2339-cannot-click-close-icon-on-touch-surface-for-jquery-ui-draggable-window
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 2c0e4df042888fd6609ea2644cbf8ab5b4119f91
Author: Sebastian Wagner
AuthorDate: Sat May 16 18:25:26 2020 +1200
OPENMEETINGS-2339 Fix issue around icons hidden behind dragging element for
video-pod.
---
.../src/main/java/org/apache/openmeetings/web/room/raw-video.js | 2 +-
openmeetings-web/src/main/webapp/css/raw-room.css | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index 52d1f2f..5d79e4a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -287,7 +287,7 @@ var Video = (function() {
});
}
v.parent().find('.ui-dialog-titlebar-close').remove();
-
v.parent().find('.ui-dialog-titlebar').append(OmUtil.tmpl('#video-button-bar'));
+ v.parent().append(OmUtil.tmpl('#video-button-bar'));
const refresh = v.parent().find('.btn-refresh')
, tgl = v.parent().find('.btn-toggle')
, cls = v.parent().find('.btn-wclose');
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 2aea7c6..2f112ee 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -425,11 +425,11 @@ html[dir="rtl"] .room-block .sb-wb .sidebar {
.user-video .ui-dialog-titlebar
, .sharer .ui-dialog-titlebar
, .wb-tool-settings .ui-dialog-titlebar
-, .user-video .ui-dialog-titlebar .buttonpane
{
background-color: var(--white);
}
-.user-video .ui-dialog-titlebar .buttonpane {
+.user-video .buttonpane {
+ background-color: var(--white);
position: absolute;
right: 2px;
top: 2px
[openmeetings] branch feature/OPENMEETINGS-2347-fix-recording-ui-cut-files-when-nested updated: OPENMEETINGS-2347 Fix rename of now common variable.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2347-fix-recording-ui-cut-files-when-nested
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to
refs/heads/feature/OPENMEETINGS-2347-fix-recording-ui-cut-files-when-nested by
this push:
new 9f7bd75 OPENMEETINGS-2347 Fix rename of now common variable.
9f7bd75 is described below
commit 9f7bd75010a1fc2e63501d09fa9c1123bdf0cc72
Author: Sebastian Wagner
AuthorDate: Wed May 13 08:13:42 2020 +1200
OPENMEETINGS-2347 Fix rename of now common variable.
---
.../org/apache/openmeetings/web/room/raw-room.js | 2 +-
openmeetings-web/src/main/webapp/css/raw-room.css | 2 +-
openmeetings-web/src/main/webapp/css/raw-tree.css | 34 +++---
.../src/main/webapp/css/raw-variables.css | 5 ++--
openmeetings-web/src/main/webapp/css/raw-wb.css| 6 ++--
5 files changed, 24 insertions(+), 25 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
index 80c1281..75572e3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
@@ -120,7 +120,7 @@ var Room = (function() {
function _setSize() {
const sbW = _sbWidth()
, holder = $('.room-block');
- ($('.main.room')[0]).style.setProperty('--room-sidebar-width',
sbW + 'px');
+ ($('.main.room')[0]).style.setProperty('--sidebar-width', sbW +
'px');
if (sbW > 285) {
holder.addClass('big').removeClass('narrow');
} else {
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 7f7f144..2aea7c6 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -24,7 +24,7 @@
}
.room-block .sb-wb .sidebar {
min-width: 155px;
- width: var(--room-sidebar-width);
+ width: var(--sidebar-width);
position: absolute;
height: 100%;
top: 0;
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index b978f1d..d4eef5c 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -7,7 +7,7 @@
}
.file-tree .trees {
height: calc(100% - var(--tree-header-height) -
var(--tree-footer-height));
- width: var(--room-sidebar-width);
+ width: var(--sidebar-width);
overflow-x: auto;
overflow-y: auto;
}
@@ -28,85 +28,85 @@
.file-tree .file.item .name
, .file-tree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 26px);
+ max-width: calc(var(--sidebar-width) - 26px);
min-width: 60px;
}
.file-tree .tree-subtree .file.item .name
, .file-tree .tree-subtree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 44px);
+ max-width: calc(var(--sidebar-width) - 44px);
}
.file-tree .tree-subtree .tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 62px);
+ max-width: calc(var(--sidebar-width) - 62px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .file.item .name
span
{
- max-width: calc(var(--room-sidebar-width) - 80px);
+ max-width: calc(var(--sidebar-width) - 80px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree .file.item
.name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 98px);
+ max-width: calc(var(--sidebar-width) - 98px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 116px);
+ max-width: calc(var(--sidebar-width) - 116px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 134px);
+ max-width: calc(var(--sidebar-width) - 134px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .tree-subtree .file.item .name
, .file-t
[openmeetings] branch master updated (cd45b78 -> d506fb2)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from cd45b78 [OPENMEETINGS-2328] useSsl wasn't get called add 6a37b42 OPENMEETINGS-2347 Fix to apply width based on sidebar same as in room. new d506fb2 Merge pull request #81 from apache/feature/OPENMEETINGS-2347-fix-recording-ui-cut-files-when-nested 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: openmeetings-web/src/main/webapp/css/raw-variables.css | 1 + 1 file changed, 1 insertion(+)
[openmeetings] 01/01: Merge pull request #81 from apache/feature/OPENMEETINGS-2347-fix-recording-ui-cut-files-when-nested
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit d506fb2c5e42fc4d69716d3736252c3392d98dfc Merge: cd45b78 6a37b42 Author: Sebastian Wagner AuthorDate: Mon May 11 08:38:29 2020 +1200 Merge pull request #81 from apache/feature/OPENMEETINGS-2347-fix-recording-ui-cut-files-when-nested OPENMEETINGS-2347 Fix to apply width based on sidebar same as in room. openmeetings-web/src/main/webapp/css/raw-variables.css | 1 + 1 file changed, 1 insertion(+)
[openmeetings] branch feature/OPENMEETINGS-2347-fix-recording-ui-cut-files-when-nested created (now 6a37b42)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2347-fix-recording-ui-cut-files-when-nested in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 6a37b42 OPENMEETINGS-2347 Fix to apply width based on sidebar same as in room. This branch includes the following new commits: new 6a37b42 OPENMEETINGS-2347 Fix to apply width based on sidebar same as in room. 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.
[openmeetings] 01/01: OPENMEETINGS-2347 Fix to apply width based on sidebar same as in room.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2347-fix-recording-ui-cut-files-when-nested
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 6a37b42aa5736026dba553e20f3e544210dc095a
Author: Sebastian Wagner
AuthorDate: Sun May 10 11:46:11 2020 +1200
OPENMEETINGS-2347 Fix to apply width based on sidebar same as in room.
---
openmeetings-web/src/main/webapp/css/raw-variables.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/openmeetings-web/src/main/webapp/css/raw-variables.css
b/openmeetings-web/src/main/webapp/css/raw-variables.css
index 55b38dc..eac09f9 100644
--- a/openmeetings-web/src/main/webapp/css/raw-variables.css
+++ b/openmeetings-web/src/main/webapp/css/raw-variables.css
@@ -4,6 +4,7 @@ body {
--menu-height: 36px;
--level-color: #ADFF2F;
--rooms-header-height: 70px;
+ --room-sidebar-width: 315px;
--tabs-height: 45px;
--buffer-size: 4px;
--menu-zindex: 1000;
[openmeetings] branch master updated: Fix wrong name for MD file for Github.
This is an automated email from the ASF dual-hosted git repository. sebawagner 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 7e88dad Fix wrong name for MD file for Github. 7e88dad is described below commit 7e88dad1770c9fa3ba07397385173e5a841c1859 Author: Sebastian Wagner AuthorDate: Sat May 9 09:06:52 2020 +1200 Fix wrong name for MD file for Github. --- CONTRIBUTE.md => CONTRIBUTING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/CONTRIBUTE.md b/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTE.md rename to CONTRIBUTING.md
[openmeetings] branch master updated: NO-Jira - Add Contribute.md for Github.
This is an automated email from the ASF dual-hosted git repository. sebawagner 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 8958870 NO-Jira - Add Contribute.md for Github. 8958870 is described below commit 8958870bea106e6b0ba7f1a987d7e01224703600 Author: Sebastian Wagner AuthorDate: Sat May 9 09:04:40 2020 +1200 NO-Jira - Add Contribute.md for Github. --- CONTRIBUTE.md | 17 + 1 file changed, 17 insertions(+) diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md new file mode 100644 index 000..fb5b337 --- /dev/null +++ b/CONTRIBUTE.md @@ -0,0 +1,17 @@ + + +How to get involved +=== +Please visit the project website for the latest information: + - [https://openmeetings.apache.org/get-involved.html](https://openmeetings.apache.org/get-involved.html) + + +We are using Jira +=== +Bugs and other issues can be posted on the project [https://issues.apache.org/jira/projects/OPENMEETINGS](https://issues.apache.org/jira/projects/OPENMEETINGS) + + +Good First PR requests +=== +Here are a few sample PR requests to get started + - Good First issues: [Some example PR requests you may want to see](https://github.com/apache/openmeetings/pulls?q=is%3Apr+label%3A%22good+first+issue%22+)
[openmeetings] branch master updated (87b7629 -> fc1c189)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 87b7629 Merge branch 'master' of github.com:apache/openmeetings add f7aa311 OPENMEETINGS-2343 Menu header minor change to spacing and size if there is enough. add 418c61b OPENMEETINGS-2343 Fix text also to give more space when available. add a7c4676 OPENMEETINGS-2343 leave some space between ellipses and border. new fc1c189 Merge pull request #78 from apache/feature/OPENMEETINGS-2343-file-tabs-menu-headers-spacing 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: openmeetings-web/src/main/webapp/css/raw-room.css | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-)
[openmeetings] 01/01: Merge pull request #78 from apache/feature/OPENMEETINGS-2343-file-tabs-menu-headers-spacing
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit fc1c1895c11eda832a4df684f4a44c9a06c4f86c Merge: 87b7629 a7c4676 Author: Sebastian Wagner AuthorDate: Thu May 7 12:15:45 2020 +1200 Merge pull request #78 from apache/feature/OPENMEETINGS-2343-file-tabs-menu-headers-spacing OPENMEETINGS-2343 Menu header minor change to spacing and size openmeetings-web/src/main/webapp/css/raw-room.css | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2343-file-tabs-menu-headers-spacing updated (418c61b -> a7c4676)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2343-file-tabs-menu-headers-spacing in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 418c61b OPENMEETINGS-2343 Fix text also to give more space when available. add a7c4676 OPENMEETINGS-2343 leave some space between ellipses and border. No new revisions were added by this update. Summary of changes: openmeetings-web/src/main/webapp/css/raw-room.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[openmeetings] branch feature/OPENMEETINGS-2343-file-tabs-menu-headers-spacing updated (f7aa311 -> 418c61b)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2343-file-tabs-menu-headers-spacing in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from f7aa311 OPENMEETINGS-2343 Menu header minor change to spacing and size if there is enough. add 418c61b OPENMEETINGS-2343 Fix text also to give more space when available. No new revisions were added by this update. Summary of changes: openmeetings-web/src/main/webapp/css/raw-room.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[openmeetings] 01/01: OPENMEETINGS-2343 Menu header minor change to spacing and size if there is enough.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2343-file-tabs-menu-headers-spacing
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit f7aa3115568c713dec1d1d93c759ab588dcc9ce1
Author: Sebastian Wagner
AuthorDate: Wed May 6 19:28:35 2020 +1200
OPENMEETINGS-2343 Menu header minor change to spacing and size if there is
enough.
---
openmeetings-web/src/main/webapp/css/raw-room.css | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 11256c8..2cea1c8 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -374,7 +374,9 @@ html[dir="rtl"] .room-block .sb-wb .sidebar {
.room-block .sb-wb .sidebar .tab.om-icon.big {
line-height: 30px;
width: auto;
- max-width: 80px;
+ padding-left: 10px;
+ min-width: 100px;
+ max-width: 120px;
position: relative;
}
.room-block .sb-wb .sidebar .tab .badge {
@@ -391,7 +393,9 @@ html[dir="rtl"] .room-block .sb-wb .sidebar {
}
.room-block.narrow .sidebar .tab.om-icon.big {
max-width: 40px;
+ min-width: auto;
width: 40px;
+ padding-left: 6px;
padding-right: 0;
}
.room-block.narrow .sidebar .tab.om-icon.big .label {
[openmeetings] branch feature/OPENMEETINGS-2343-file-tabs-menu-headers-spacing created (now f7aa311)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2343-file-tabs-menu-headers-spacing in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at f7aa311 OPENMEETINGS-2343 Menu header minor change to spacing and size if there is enough. This branch includes the following new commits: new f7aa311 OPENMEETINGS-2343 Menu header minor change to spacing and size if there is enough. 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.
[openmeetings] 01/01: OPENMEETINGS-2344 Add horizontal scroll if size exceeds window size.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2344-file-explorer-overflow
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 03b9dc2a131dcacb40c79c5bb880ee052786ca3e
Author: Sebastian Wagner
AuthorDate: Wed May 6 19:04:34 2020 +1200
OPENMEETINGS-2344 Add horizontal scroll if size exceeds window size.
---
openmeetings-web/src/main/webapp/css/raw-tree.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index 8ce7d97..b978f1d 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -7,7 +7,8 @@
}
.file-tree .trees {
height: calc(100% - var(--tree-header-height) -
var(--tree-footer-height));
- overflow-x: hidden;
+ width: var(--room-sidebar-width);
+ overflow-x: auto;
overflow-y: auto;
}
.file-tree .trees #tree-anchor {
[openmeetings] branch feature/OPENMEETINGS-2344-file-explorer-overflow created (now 03b9dc2)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2344-file-explorer-overflow in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 03b9dc2 OPENMEETINGS-2344 Add horizontal scroll if size exceeds window size. This branch includes the following new commits: new 03b9dc2 OPENMEETINGS-2344 Add horizontal scroll if size exceeds window size. 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.
[openmeetings] branch master updated (e7bb4b9 -> b869b5b)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from e7bb4b9 [OPENMEETINGS-2346] getDisplayMedia reside in normal place for chromium-based edge (#76) add a17aea6 OPENMEETINGS-2344 Fix filetree item width to resize according to panel width. add 42adc47 OPENMEETINGS-2344 Add iterative more width depending on tree level. Up to maximum of 7 levels down. add e5cec8f OPENMEETINGS-2344 Add non broken width for tree file item add f37658e OPENMEETINGS-2344 Move tree css it tree css file. new b869b5b Merge pull request #75 from apache/feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace 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: openmeetings-web/src/main/webapp/css/raw-room.css | 5 -- openmeetings-web/src/main/webapp/css/raw-tree.css | 89 ++- 2 files changed, 86 insertions(+), 8 deletions(-)
[openmeetings] 01/01: Merge pull request #75 from apache/feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit b869b5b0a81b26ed4aa0aa7e1b559f6acb872215 Merge: e7bb4b9 f37658e Author: Sebastian Wagner AuthorDate: Wed May 6 18:36:03 2020 +1200 Merge pull request #75 from apache/feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace OPENMEETINGS-2344 Resize according to size openmeetings-web/src/main/webapp/css/raw-room.css | 5 -- openmeetings-web/src/main/webapp/css/raw-tree.css | 89 ++- 2 files changed, 86 insertions(+), 8 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace updated (e5cec8f -> f37658e)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from e5cec8f OPENMEETINGS-2344 Add non broken width for tree file item add f37658e OPENMEETINGS-2344 Move tree css it tree css file. No new revisions were added by this update. Summary of changes: openmeetings-web/src/main/webapp/css/raw-room.css | 13 - 1 file changed, 13 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace updated: OPENMEETINGS-2344 Add non broken width for tree file item
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to
refs/heads/feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace by
this push:
new e5cec8f OPENMEETINGS-2344 Add non broken width for tree file item
e5cec8f is described below
commit e5cec8f8c1d82e169e88673e230f55902457b7c2
Author: Sebastian Wagner
AuthorDate: Tue May 5 19:59:46 2020 +1200
OPENMEETINGS-2344 Add non broken width for tree file item
---
.../openmeetings/web/common/tree/FolderPanel.java | 16 --
openmeetings-web/src/main/webapp/css/raw-tree.css | 64 +-
2 files changed, 50 insertions(+), 30 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
index c3b2cba..fcc0afe 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
@@ -24,7 +24,6 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE;
import java.util.Map.Entry;
import org.apache.openmeetings.db.dao.file.FileItemDao;
-import org.apache.openmeetings.db.dao.file.FileItemLogDao;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.BaseFileItem.Type;
@@ -67,8 +66,6 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
private RecordingDao recDao;
@SpringBean
private FileItemDao fileDao;
- @SpringBean
- private FileItemLogDao fileLogDao;
public FolderPanel(String id, final IModel model, final
FileTreePanel treePanel) {
super(id, model);
@@ -228,19 +225,6 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
}
String cls = f instanceof Recording ? "recorditem " : "fileitem
";
style.append(f.isReadOnly() ? "readonlyitem " : cls);
-
- long errorCount = fileLogDao.countErrors(f);
- boolean hasError = errorCount != 0;
- if (BaseFileItem.Type.RECORDING == f.getType()) {
- Recording r = (Recording)f;
- hasError |= (Status.RECORDING != r.getStatus() &&
Status.CONVERTING != r.getStatus() && !f.exists());
- } else {
- hasError |= !f.exists();
- }
- if (hasError) {
- style.append("error");
- }
-
return style;
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index 0323285..8ce7d97 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -23,54 +23,90 @@
.file-tree .footer .sizes .size {
padding-left: 5px;
}
+/* Calc width with default for max level of 7 */
.file-tree .file.item .name
, .file-tree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 58px);
+ max-width: calc(var(--room-sidebar-width) - 26px);
min-width: 60px;
}
.file-tree .tree-subtree .file.item .name
, .file-tree .tree-subtree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 76px);
- min-width: 60px;
+ max-width: calc(var(--room-sidebar-width) - 44px);
}
.file-tree .tree-subtree .tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 94px);
- min-width: 60px;
+ max-width: calc(var(--room-sidebar-width) - 62px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .file.item .name
span
{
- max-width: calc(var(--room-sidebar-width) - 112px);
- min-width: 60px;
+ max-width: calc(var(--room-sidebar-width) - 80px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree .file.item
.name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 130px);
- min-width: 60px;
+ max-width: calc(var(--room-sidebar-width) - 98px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .file.item
[openmeetings] branch feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace updated: OPENMEETINGS-2344 Add iterative more width depending on tree level. Up to maximum of 7 levels down.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to
refs/heads/feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace by
this push:
new 42adc47 OPENMEETINGS-2344 Add iterative more width depending on tree
level. Up to maximum of 7 levels down.
42adc47 is described below
commit 42adc474d7cadd0c8088a44127cd9a6abe6a117e
Author: Sebastian Wagner
AuthorDate: Tue May 5 09:29:02 2020 +1200
OPENMEETINGS-2344 Add iterative more width depending on tree level. Up to
maximum of 7 levels down.
---
.../openmeetings/web/common/tree/FolderPanel.java | 16
openmeetings-web/src/main/webapp/css/raw-tree.css | 44 +-
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
index fcc0afe..c3b2cba 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
@@ -24,6 +24,7 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE;
import java.util.Map.Entry;
import org.apache.openmeetings.db.dao.file.FileItemDao;
+import org.apache.openmeetings.db.dao.file.FileItemLogDao;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.BaseFileItem.Type;
@@ -66,6 +67,8 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
private RecordingDao recDao;
@SpringBean
private FileItemDao fileDao;
+ @SpringBean
+ private FileItemLogDao fileLogDao;
public FolderPanel(String id, final IModel model, final
FileTreePanel treePanel) {
super(id, model);
@@ -225,6 +228,19 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
}
String cls = f instanceof Recording ? "recorditem " : "fileitem
";
style.append(f.isReadOnly() ? "readonlyitem " : cls);
+
+ long errorCount = fileLogDao.countErrors(f);
+ boolean hasError = errorCount != 0;
+ if (BaseFileItem.Type.RECORDING == f.getType()) {
+ Recording r = (Recording)f;
+ hasError |= (Status.RECORDING != r.getStatus() &&
Status.CONVERTING != r.getStatus() && !f.exists());
+ } else {
+ hasError |= !f.exists();
+ }
+ if (hasError) {
+ style.append("error");
+ }
+
return style;
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index a2d7e0c..0323285 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -26,7 +26,49 @@
.file-tree .file.item .name
, .file-tree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 100px);
+ max-width: calc(var(--room-sidebar-width) - 58px);
+ min-width: 60px;
+}
+.file-tree .tree-subtree .file.item .name
+ , .file-tree .tree-subtree .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 76px);
+ min-width: 60px;
+}
+.file-tree .tree-subtree .tree-subtree .file.item .name
+ , .file-tree .tree-subtree .tree-subtree .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 94px);
+ min-width: 60px;
+}
+.file-tree .tree-subtree .tree-subtree .tree-subtree .file.item .name
+ , .file-tree .tree-subtree .tree-subtree .tree-subtree .file.item .name
span
+{
+ max-width: calc(var(--room-sidebar-width) - 112px);
+ min-width: 60px;
+}
+.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree .file.item
.name
+ , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 130px);
+ min-width: 60px;
+}
+.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .file.item .name
+ , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 148px);
+ min-width: 60px;
+}
+.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .file.item .name
+ , .file-tree .tree-subtree .tree-subtree
[openmeetings] branch feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace created (now a17aea6)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at a17aea6 OPENMEETINGS-2344 Fix filetree item width to resize according to panel width. This branch includes the following new commits: new a17aea6 OPENMEETINGS-2344 Fix filetree item width to resize according to panel width. 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.
[openmeetings] 01/01: OPENMEETINGS-2344 Fix filetree item width to resize according to panel width.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit a17aea621a283993b8ea4ed37fb8bc4fd09cc07b
Author: Sebastian Wagner
AuthorDate: Tue May 5 08:19:58 2020 +1200
OPENMEETINGS-2344 Fix filetree item width to resize according to panel
width.
---
openmeetings-web/src/main/webapp/css/raw-room.css | 10 +-
openmeetings-web/src/main/webapp/css/raw-tree.css | 11 ---
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 40797c0..dde526f 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -397,11 +397,19 @@ html[dir="rtl"] .room-block .sb-wb .sidebar {
.room-block.narrow .sidebar .tab.om-icon.big .label {
display: none;
}
-.room-block.narrow .sidebar .file-tree .file.item .name
+/*.room-block.narrow .sidebar .file-tree .file.item .name
, .room-block.narrow .sidebar .file-tree .file.item .name span
{
+ width: calc(var(--room-sidebar-width) + var(--buffer-size));
width: 40px;
}
+.room-block .sidebar .file-tree .file.item .name
+ , .room-block .sidebar .file-tree .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 100px);
+ min-width: 60px;
+}
+*/
.room-block .wait-moder {
position: fixed;
bottom: 30px;
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index 6cb4f70..a2d7e0c 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -1,7 +1,6 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
.file-tree {
vertical-align: top;
- max-width: 350px;
height: 100%;
width: 100%;
display: inline-block;
@@ -24,6 +23,12 @@
.file-tree .footer .sizes .size {
padding-left: 5px;
}
+.file-tree .file.item .name
+ , .file-tree .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 100px);
+ min-width: 60px;
+}
.trash-toolbar {
font-weight: bold;
line-height: 20px;
@@ -155,8 +160,6 @@
.file.item .name, .file.item .name span {
color: black;
display: block;
- width: 230px;
- max-width: 230px;
/* Required for text-overflow to do anything */
text-overflow: ellipsis;
white-space: nowrap;
@@ -171,6 +174,8 @@
right: 0px;
width: 32px;
height: 32px;
+ margin: 0px;
+ padding: 0px;
}
.file.item .errors::before {
color: var(--warning);
[openmeetings] 01/01: Merge pull request #74 from apache/feature/OPENMEETINGS-2275-update-whiteboard-tool-panel-with-proposal
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 219457e4a2356c4db3af0443f7034eb5cfab3a34 Merge: 18c5365 044ffdc Author: Sebastian Wagner AuthorDate: Sun May 3 18:32:52 2020 +1200 Merge pull request #74 from apache/feature/OPENMEETINGS-2275-update-whiteboard-tool-panel-with-proposal OPENMEETINGS-2275 Update whiteboard tools bar with proposed design .../apache/openmeetings/web/room/wb/WbPanel.html | 58 +++--- .../apache/openmeetings/web/room/wb/raw-wb-area.js | 1 + .../openmeetings/web/room/wb/raw-wb-board.js | 14 +- openmeetings-web/src/main/webapp/css/raw-wb.css| 13 + 4 files changed, 56 insertions(+), 30 deletions(-)
[openmeetings] branch master updated (18c5365 -> 219457e)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 18c5365 [OPENMEETINGS-2342] useless forse TZ message is dropped add 0947371 OPENMEETINGS-2275 Update whiteboard tools bar with proposed design changes. add 044ffdc Merge branch 'master' into feature/OPENMEETINGS-2275-update-whiteboard-tool-panel-with-proposal new 219457e Merge pull request #74 from apache/feature/OPENMEETINGS-2275-update-whiteboard-tool-panel-with-proposal 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: .../apache/openmeetings/web/room/wb/WbPanel.html | 58 +++--- .../apache/openmeetings/web/room/wb/raw-wb-area.js | 1 + .../openmeetings/web/room/wb/raw-wb-board.js | 14 +- openmeetings-web/src/main/webapp/css/raw-wb.css| 13 + 4 files changed, 56 insertions(+), 30 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2275-update-whiteboard-tool-panel-with-proposal updated (0947371 -> 044ffdc)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2275-update-whiteboard-tool-panel-with-proposal in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 0947371 OPENMEETINGS-2275 Update whiteboard tools bar with proposed design changes. add 1685130 [OPENMEETINGS-2299] test should be fixed add bf421d8 [OPENMEETINGS-2299] test should be fixed add 67a772e [OPENMEETINGS-2299] changes are reverted add 0421988 [OPENMEETINGS-2299] test should be fixed add 044ffdc Merge branch 'master' into feature/OPENMEETINGS-2275-update-whiteboard-tool-panel-with-proposal No new revisions were added by this update. Summary of changes: .../org/apache/openmeetings/core/remote/BaseMockedTest.java | 5 +++-- .../openmeetings/core/remote/TestRecordingFlowMocked.java | 8 .../apache/openmeetings/core/remote/TestRoomFlowMocked.java | 10 +- .../openmeetings/core/remote/TestSetupFlowMocked.java | 13 ++--- .../apache/openmeetings/web/app/TestUserManagerMocked.java | 5 +++-- 5 files changed, 21 insertions(+), 20 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2275-update-whiteboard-tool-panel-with-proposal created (now 0947371)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2275-update-whiteboard-tool-panel-with-proposal in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 0947371 OPENMEETINGS-2275 Update whiteboard tools bar with proposed design changes. This branch includes the following new commits: new 0947371 OPENMEETINGS-2275 Update whiteboard tools bar with proposed design changes. 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.
[openmeetings] 01/01: OPENMEETINGS-2275 Update whiteboard tools bar with proposed design changes.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2275-update-whiteboard-tool-panel-with-proposal
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 0947371cd534662fba370724d9da6c50b2e0192b
Author: Sebastian Wagner
AuthorDate: Sun May 3 11:42:29 2020 +1200
OPENMEETINGS-2275 Update whiteboard tools bar with proposed design changes.
---
.../apache/openmeetings/web/room/wb/WbPanel.html | 58 +++---
.../apache/openmeetings/web/room/wb/raw-wb-area.js | 1 +
.../openmeetings/web/room/wb/raw-wb-board.js | 14 +-
openmeetings-web/src/main/webapp/css/raw-wb.css| 13 +
4 files changed, 56 insertions(+), 30 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index 15c7970..4e5f7fb 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -81,7 +81,7 @@
-
+
@@ -90,7 +90,7 @@
-
+
@@ -105,39 +105,41 @@
1
-
+
-
-
-
-
-
-
-
-
-
- 120%
- 50%
- 75%
- 100%
- 125%
- 150%
- 200%
- 300%
- 400%
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 120%
+ 50%
+ 75%
+ 100%
+ 125%
+ 150%
+ 200%
+ 300%
+ 400%
+
+
+
+
+
+
-
-
+
+
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
index 0770af9..f3d7ed6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
@@ -232,6 +232,7 @@ var DrawWbArea = function() {
self.removeDeleteHandler
[openmeetings] branch feature/OPENMEETINGS-2338-re-enter-room-remembers-javascript-values-for-sharer updated (6c2972a -> 39dd030)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2338-re-enter-room-remembers-javascript-values-for-sharer in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 6c2972a OPENMEETINGS-2338 Fix typo on word STOPPED. add 39dd030 OPENMEETINGS-2338 fix accidental temporary file being committed. No new revisions were added by this update. Summary of changes: .../current_openmeetings_context_name_IS_UNDEFINED.log| 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 openmeetings-web/current_openmeetings_log_dir_IS_UNDEFINED/current_openmeetings_context_name_IS_UNDEFINED.log
[openmeetings] branch feature/OPENMEETINGS-2338-re-enter-room-remembers-javascript-values-for-sharer updated (77d153f -> 6c2972a)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2338-re-enter-room-remembers-javascript-values-for-sharer in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 77d153f OPENMEETINGS-2338 Fix reset of values in browser when re-entering room add 6c2972a OPENMEETINGS-2338 Fix typo on word STOPPED. No new revisions were added by this update. Summary of changes: .../java/org/apache/openmeetings/web/room/raw-sharer.js| 14 +++--- .../org/apache/openmeetings/web/room/raw-video-manager.js | 4 ++-- .../java/org/apache/openmeetings/web/room/raw-video.js | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-)
[openmeetings] branch feature/OPENMEETINGS-2338-re-enter-room-remembers-javascript-values-for-sharer created (now 77d153f)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2338-re-enter-room-remembers-javascript-values-for-sharer in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at 77d153f OPENMEETINGS-2338 Fix reset of values in browser when re-entering room This branch includes the following new commits: new 77d153f OPENMEETINGS-2338 Fix reset of values in browser when re-entering room 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.
