You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/01/26 03:53:09 UTC
[01/13] openmeetings git commit: [OPENMEETINGS-1777]
maven-site-plugin version is updated
Repository: openmeetings
Updated Branches:
refs/heads/wicket-defer-all e6eddcbaf -> e379eb9eb
[OPENMEETINGS-1777] maven-site-plugin version is updated
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/2c4af693
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/2c4af693
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/2c4af693
Branch: refs/heads/wicket-defer-all
Commit: 2c4af69346e76f2ce35beed809f6ddc5974cb0af
Parents: e4847e6
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Jan 6 11:59:28 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Jan 6 11:59:28 2018 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2c4af693/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 899f697..f62be71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<!-- plugin versions -->
<maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
- <maven-site-plugin.version>3.6</maven-site-plugin.version>
+ <maven-site-plugin.version>3.7</maven-site-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
[08/13] openmeetings git commit: [OPENMEETINGS-1773] old file items
are being updated in DB after re-converting
Posted by so...@apache.org.
[OPENMEETINGS-1773] old file items are being updated in DB after re-converting
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/06a85fe8
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/06a85fe8
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/06a85fe8
Branch: refs/heads/wicket-defer-all
Commit: 06a85fe8c3001cb8abcbff7c0b4988604d103d87
Parents: ffde697
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Jan 12 12:59:02 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jan 12 12:59:02 2018 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/openmeetings/backup/BackupImport.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/06a85fe8/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 83f05d0..621f449 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -429,6 +429,7 @@ public class BackupImport {
}
if (BaseFileItem.Type.Presentation == bfi.getType()) {
convertOldPresentation((FileItem)bfi);
+ fileItemDao._update(bfi);
}
if (BaseFileItem.Type.WmlFile == bfi.getType()) {
try {
[09/13] openmeetings git commit: no jira: typo is fixed
Posted by so...@apache.org.
no jira: typo is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/33e8f234
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/33e8f234
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/33e8f234
Branch: refs/heads/wicket-defer-all
Commit: 33e8f234401afaedcc88dd232cea743569c30c61
Parents: 06a85fe
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Jan 19 17:15:44 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jan 19 17:15:44 2018 +0700
----------------------------------------------------------------------
.../web/app/Application.properties.xml | 2 +-
.../web/app/Application_ar.properties.xml | 2 +-
.../web/app/Application_bg.properties.xml | 2 +-
.../web/app/Application_ca.properties.xml | 2 +-
.../web/app/Application_cs.properties.xml | 2 +-
.../web/app/Application_da.properties.xml | 2 +-
.../web/app/Application_de.properties.xml | 26 ++++++++++----------
.../web/app/Application_el.properties.xml | 2 +-
.../web/app/Application_es.properties.xml | 2 +-
.../web/app/Application_fa.properties.xml | 2 +-
.../web/app/Application_fi.properties.xml | 2 +-
.../web/app/Application_fr.properties.xml | 2 +-
.../web/app/Application_gl.properties.xml | 2 +-
.../web/app/Application_he.properties.xml | 2 +-
.../web/app/Application_hu.properties.xml | 2 +-
.../web/app/Application_id.properties.xml | 2 +-
.../web/app/Application_it.properties.xml | 2 +-
.../web/app/Application_ja.properties.xml | 2 +-
.../web/app/Application_ko.properties.xml | 2 +-
.../web/app/Application_nl.properties.xml | 2 +-
.../web/app/Application_pl.properties.xml | 2 +-
.../web/app/Application_pt.properties.xml | 2 +-
.../web/app/Application_pt_BR.properties.xml | 2 +-
.../web/app/Application_sk.properties.xml | 2 +-
.../web/app/Application_sv.properties.xml | 2 +-
.../web/app/Application_th.properties.xml | 2 +-
.../web/app/Application_tr.properties.xml | 2 +-
.../web/app/Application_uk.properties.xml | 2 +-
.../web/app/Application_zh_CN.properties.xml | 2 +-
.../web/app/Application_zh_TW.properties.xml | 2 +-
30 files changed, 42 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 16d3bad..d52e9f5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Text]]></entry>
<entry key="74"><![CDATA[Paint]]></entry>
<entry key="75"><![CDATA[Draw line]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Rectangle]]></entry>
<entry key="78"><![CDATA[Ellipse]]></entry>
<entry key="79"><![CDATA[Arrow]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 3e3d810..d98e6e7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[النص]]></entry>
<entry key="74"><![CDATA[الطلاء]]></entry>
<entry key="75"><![CDATA[استرعى الخط]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[مستطيل]]></entry>
<entry key="78"><![CDATA[بيضوي]]></entry>
<entry key="79"><![CDATA[السهم]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 0f57dce..67f6bb3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Текст]]></entry>
<entry key="74"><![CDATA[Рисуване]]></entry>
<entry key="75"><![CDATA[Чертаене на линия]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Правоъгълник]]></entry>
<entry key="78"><![CDATA[Елипса]]></entry>
<entry key="79"><![CDATA[Стрелка]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 0d89800..1334ef7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Text]]></entry>
<entry key="74"><![CDATA[Pintar]]></entry>
<entry key="75"><![CDATA[Traçar una línia]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Rectangle]]></entry>
<entry key="78"><![CDATA[El·lipse]]></entry>
<entry key="79"><![CDATA[Data]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 268e180..e7c9f4b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Text]]></entry>
<entry key="74"><![CDATA[Kreslení]]></entry>
<entry key="75"><![CDATA[Kresli čáru]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[čtyřúhelník]]></entry>
<entry key="78"><![CDATA[Elipsa]]></entry>
<entry key="79"><![CDATA[Šipka]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index f4323ee..eaac5be 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Tekst]]></entry>
<entry key="74"><![CDATA[Mal/tegn]]></entry>
<entry key="75"><![CDATA[Tegn linie]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Rektangel]]></entry>
<entry key="78"><![CDATA[Ellipse]]></entry>
<entry key="79"><![CDATA[Pil]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index 2ee8243..4065c1a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Text]]></entry>
<entry key="74"><![CDATA[Frei zeichnen]]></entry>
<entry key="75"><![CDATA[Linien zeichnen]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Textmarker]]></entry>
<entry key="77"><![CDATA[Rechteck]]></entry>
<entry key="78"><![CDATA[Kreis]]></entry>
<entry key="79"><![CDATA[Pfeil]]></entry>
@@ -609,18 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Builddate]]></entry>
<entry key="1555"><![CDATA[heute]]></entry>
- <entry key="1556">Jan</entry>
- <entry key="1557">Feb</entry>
- <entry key="1558">Mär</entry>
- <entry key="1559">Apr</entry>
- <entry key="1560">Mai</entry>
- <entry key="1561">Jun</entry>
- <entry key="1562">Jul</entry>
- <entry key="1563">Aug</entry>
- <entry key="1564">Sep</entry>
- <entry key="1565">Okt</entry>
- <entry key="1566">Nov</entry>
- <entry key="1567">Dez</entry>
+ <entry key="1556"><![CDATA[Jan]]></entry>
+ <entry key="1557"><![CDATA[Feb]]></entry>
+ <entry key="1558"><![CDATA[Mär]]></entry>
+ <entry key="1559"><![CDATA[Apr]]></entry>
+ <entry key="1560"><![CDATA[Mai]]></entry>
+ <entry key="1561"><![CDATA[Jun]]></entry>
+ <entry key="1562"><![CDATA[Jul]]></entry>
+ <entry key="1563"><![CDATA[Aug]]></entry>
+ <entry key="1564"><![CDATA[Sep]]></entry>
+ <entry key="1565"><![CDATA[Okt]]></entry>
+ <entry key="1566"><![CDATA[Nov]]></entry>
+ <entry key="1567"><![CDATA[Dez]]></entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[OAuth2 Konfigurationen]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index 26a5dcc..79aa33f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Κείμενο]]></entry>
<entry key="74"><![CDATA[Ζωγραφική]]></entry>
<entry key="75"><![CDATA[Σχεδίαση Γραμμής]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Ορθογώνιο]]></entry>
<entry key="78"><![CDATA[Έλλειψη]]></entry>
<entry key="79"><![CDATA[Βέλος]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index da6a47c..6415c2b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Texto]]></entry>
<entry key="74"><![CDATA[Pintar]]></entry>
<entry key="75"><![CDATA[Trazar una línea]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Rectángulo]]></entry>
<entry key="78"><![CDATA[Elipse]]></entry>
<entry key="79"><![CDATA[Flecha]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index ec09a5a..2f629f2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[متن]]></entry>
<entry key="74"><![CDATA[كردن نقاشي]]></entry>
<entry key="75"><![CDATA[كشيدن خط]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[گوش چهار]]></entry>
<entry key="78"><![CDATA[بيضي]]></entry>
<entry key="79"><![CDATA[پيكان]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 38443d0..2c55743 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Teksti]]></entry>
<entry key="74"><![CDATA[Piirrä]]></entry>
<entry key="75"><![CDATA[Piirrä viiva]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Suorakaide]]></entry>
<entry key="78"><![CDATA[Ellipsi]]></entry>
<entry key="79"><![CDATA[Nuoli]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 59e6ba6..ecb3108 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Texte]]></entry>
<entry key="74"><![CDATA[Dessiner]]></entry>
<entry key="75"><![CDATA[Tracer une ligne]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Rectangle]]></entry>
<entry key="78"><![CDATA[Ellipse]]></entry>
<entry key="79"><![CDATA[Flèche]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 743cbd1..a623a89 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Texto]]></entry>
<entry key="74"><![CDATA[Pintar]]></entry>
<entry key="75"><![CDATA[Debuxar unha liña]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Rectángulo]]></entry>
<entry key="78"><![CDATA[Elipse]]></entry>
<entry key="79"><![CDATA[Frecha]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index 16d3bad..d52e9f5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Text]]></entry>
<entry key="74"><![CDATA[Paint]]></entry>
<entry key="75"><![CDATA[Draw line]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Rectangle]]></entry>
<entry key="78"><![CDATA[Ellipse]]></entry>
<entry key="79"><![CDATA[Arrow]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index fab98eb..1d0d32c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Szöveg]]></entry>
<entry key="74"><![CDATA[Rajz]]></entry>
<entry key="75"><![CDATA[Vonal]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Négyszög]]></entry>
<entry key="78"><![CDATA[Ellipszis]]></entry>
<entry key="79"><![CDATA[Nyíl]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index 2f93fc0..cfc4187 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Tulisan]]></entry>
<entry key="74"><![CDATA[Gambar]]></entry>
<entry key="75"><![CDATA[Gambar garis]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Kotak]]></entry>
<entry key="78"><![CDATA[Lonjong]]></entry>
<entry key="79"><![CDATA[Panah]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index 4a8dd3d..aad4f40 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Testo]]></entry>
<entry key="74"><![CDATA[Disegna]]></entry>
<entry key="75"><![CDATA[Disegna una linea]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Rettangolo]]></entry>
<entry key="78"><![CDATA[Ellisse]]></entry>
<entry key="79"><![CDATA[Freccia]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 1dcb6be..2d83344 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[文字列]]></entry>
<entry key="74"><![CDATA[自由線]]></entry>
<entry key="75"><![CDATA[直線]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[四角形]]></entry>
<entry key="78"><![CDATA[楕円]]></entry>
<entry key="79"><![CDATA[矢印]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index bc0a118..70b97b2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[원문]]></entry>
<entry key="74"><![CDATA[페인트]]></entry>
<entry key="75"><![CDATA[선 긋기]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[직사각형]]></entry>
<entry key="78"><![CDATA[타원형]]></entry>
<entry key="79"><![CDATA[화살표]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index b5dd4d3..3ef8c59 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Tekst]]></entry>
<entry key="74"><![CDATA[Verf]]></entry>
<entry key="75"><![CDATA[Lijn Trekken]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Rechthoek]]></entry>
<entry key="78"><![CDATA[Ellipse]]></entry>
<entry key="79"><![CDATA[Pijl]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index c667eb1..8ceaeb7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Tekst]]></entry>
<entry key="74"><![CDATA[Malowanie]]></entry>
<entry key="75"><![CDATA[Rysuj linię]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Prostokąt]]></entry>
<entry key="78"><![CDATA[Elipsa]]></entry>
<entry key="79"><![CDATA[Strzałka]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index ffe2138..fe65abd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Texto]]></entry>
<entry key="74"><![CDATA[Pintura]]></entry>
<entry key="75"><![CDATA[Desenhar linha]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Retângulo]]></entry>
<entry key="78"><![CDATA[Elipse]]></entry>
<entry key="79"><![CDATA[Seta]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index 62327f0..ed4bb90 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Texto]]></entry>
<entry key="74"><![CDATA[Pintura]]></entry>
<entry key="75"><![CDATA[Desenhar linha]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Retângulo]]></entry>
<entry key="78"><![CDATA[Elipse]]></entry>
<entry key="79"><![CDATA[Seta]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index a6f9406..8a781cb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Text]]></entry>
<entry key="74"><![CDATA[Farba]]></entry>
<entry key="75"><![CDATA[Nakresliť čiaru]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Obdĺžnik]]></entry>
<entry key="78"><![CDATA[Elipsa]]></entry>
<entry key="79"><![CDATA[Šípka]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 597abfd..0411ff0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Text]]></entry>
<entry key="74"><![CDATA[Måla]]></entry>
<entry key="75"><![CDATA[Rita linje]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Rektangel]]></entry>
<entry key="78"><![CDATA[Ellips]]></entry>
<entry key="79"><![CDATA[Pil]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 76b34e7..2edf215 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[ข้อความ]]></entry>
<entry key="74"><![CDATA[ระบายสี]]></entry>
<entry key="75"><![CDATA[วาดเส้น]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[สี่เหลี่ยมผืนผ้า]]></entry>
<entry key="78"><![CDATA[วงรี]]></entry>
<entry key="79"><![CDATA[ลูกศร]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index 90d0e7b..118c956 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Metin]]></entry>
<entry key="74"><![CDATA[Boyama]]></entry>
<entry key="75"><![CDATA[Çizgi çiz]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Dikdörtgen]]></entry>
<entry key="78"><![CDATA[Elips]]></entry>
<entry key="79"><![CDATA[Ok]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 07ff504..ae77f7e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[Текст]]></entry>
<entry key="74"><![CDATA[Малювання]]></entry>
<entry key="75"><![CDATA[Провести лінію]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[Прямокутник]]></entry>
<entry key="78"><![CDATA[Еліпс]]></entry>
<entry key="79"><![CDATA[Стрілка]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 54610be..3ad56c5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[文本]]></entry>
<entry key="74"><![CDATA[绘画]]></entry>
<entry key="75"><![CDATA[画线]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[矩形]]></entry>
<entry key="78"><![CDATA[椭圆]]></entry>
<entry key="79"><![CDATA[箭头]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33e8f234/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 8d69ecb..b095b61 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -59,7 +59,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="73"><![CDATA[全文]]></entry>
<entry key="74"><![CDATA[繪畫]]></entry>
<entry key="75"><![CDATA[畫線]]></entry>
- <entry key="76"><![CDATA[Highligher]]></entry>
+ <entry key="76"><![CDATA[Highlighter]]></entry>
<entry key="77"><![CDATA[長方形]]></entry>
<entry key="78"><![CDATA[橢圓形]]></entry>
<entry key="79"><![CDATA[箭頭]]></entry>
[11/13] openmeetings git commit: [OPENMEETINGS-1777] apache parent
version is bumped
Posted by so...@apache.org.
[OPENMEETINGS-1777] apache parent version is bumped
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/2bcafa61
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/2bcafa61
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/2bcafa61
Branch: refs/heads/wicket-defer-all
Commit: 2bcafa61dba2f3ac3ea54abaa7a0e4424969dee9
Parents: 1ec0fca
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Jan 25 14:04:52 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Jan 25 14:04:52 2018 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2bcafa61/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e4ebfae..2aceccd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>19</version>
</parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
[13/13] openmeetings git commit: Merged with upstream,
code is updated to work with PR#258
Posted by so...@apache.org.
Merged with upstream, code is updated to work with PR#258
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e379eb9e
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e379eb9e
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e379eb9e
Branch: refs/heads/wicket-defer-all
Commit: e379eb9eb86e6b992afbeb730040c46e2765e175
Parents: 2b571fe
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Jan 26 10:52:59 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jan 26 10:52:59 2018 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/web/app/Application.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e379eb9e/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 9af5134..5251c15 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -113,6 +113,8 @@ import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler;
import org.apache.wicket.core.request.handler.ListenerRequestHandler;
import org.apache.wicket.core.request.mapper.MountedMapper;
+import org.apache.wicket.markup.head.ResourceAggregator;
+import org.apache.wicket.markup.head.filter.JavaScriptDeferHeaderResponse;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.pageStore.IDataStore;
import org.apache.wicket.protocol.ws.WebSocketAwareCsrfPreventionRequestCycleListener;
@@ -260,6 +262,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica
});
super.init();
+ setHeaderResponseDecorator(response -> new ResourceAggregator(new JavaScriptDeferHeaderResponse(response)));
// register some widgets
dashboardContext = new DashboardContext();
[04/13] openmeetings git commit: [OPENMEETINGS-1810] wbsize on
activities open/closed should be fixed
Posted by so...@apache.org.
[OPENMEETINGS-1810] wbsize on activities open/closed should be fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/9922eecc
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/9922eecc
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/9922eecc
Branch: refs/heads/wicket-defer-all
Commit: 9922eecc3e5f6ceab6fc32c917c5f073c542c952
Parents: f95b632
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Jan 11 20:16:25 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Jan 11 20:16:49 2018 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/openmeetings/web/admin/admin.js | 2 +-
.../main/java/org/apache/openmeetings/web/room/room-base.js | 8 +++++---
.../openmeetings/web/user/calendar/calendar-functions.js | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9922eecc/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js
index 3574ce8..a35cd2c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js
@@ -4,7 +4,7 @@ function adminPanelInit() {
extAdminPanelInit();
}
const f = $('#adminForm'), t = $('#adminTable')
- , h = $(window).height() - 5;
+ , h = window.innerHeight - 5;
if (f.length === 1 && t.length === 1) {
f.height(h - f.position().top);
t.height(h - t.position().top);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9922eecc/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js
index ba3526f..4934780 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js
@@ -633,10 +633,12 @@ var Room = (function() {
return sb === undefined ? 0 : sb.width() + parseInt(sb.css(sbSide));
}
function _setSize() {
- const sbW = _sbWidth()
- , w = $(window).width() - sbW - 8
+ const tw = window.innerWidth
+ , th = window.innerHeight
+ , sbW = _sbWidth()
+ , w = tw - sbW - 8
, ah = !!activities && activities.is(':visible') ? activities.height() : 0
- , h = $(window).height() - menuHeight - 3
+ , h = th - menuHeight - 3
, hh = h - 5
, p = sb.find('.tabs')
, ulh = $("ul", p).height()
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9922eecc/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
index af4bc54..6274bf2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
@@ -3,7 +3,7 @@
* @author Sebastien Briquet
*/
function getCalendarHeight() {
- return $(window).height() - $('#${markupId}').position().top - 20;
+ return window.innerHeight - $('#${markupId}').position().top - 20;
}
function setCalendarHeight() {
const cal = $('#${markupId}');
[02/13] openmeetings git commit: [OPENMEETINGS-1812] admin password
is checked during update of privileged user
Posted by so...@apache.org.
[OPENMEETINGS-1812] admin password is checked during update of privileged user
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c384a4a0
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c384a4a0
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c384a4a0
Branch: refs/heads/wicket-defer-all
Commit: c384a4a0e44dde7dbf17c7373423186338526f0e
Parents: 2c4af69
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Jan 6 18:59:35 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Jan 6 18:59:35 2018 +0700
----------------------------------------------------------------------
.../web/admin/users/PasswordDialog.html | 28 +++++
.../web/admin/users/PasswordDialog.java | 103 +++++++++++++++++++
.../openmeetings/web/admin/users/UserForm.html | 1 +
.../openmeetings/web/admin/users/UserForm.java | 50 ++++++---
.../web/common/FormSaveRefreshPanel.java | 11 +-
.../openmeetings/web/common/NameDialog.html | 2 +-
.../web/room/activities/activities.js | 2 +-
.../openmeetings/web/user/chat/chat-base.js | 1 -
8 files changed, 179 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c384a4a0/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html
new file mode 100644
index 0000000..0d4e2bd
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <form wicket:id="form">
+ <label style="padding: 0 20px;" wicket:for="password"><wicket:message key="current.password"/></label><input type="password" wicket:id="password"/>
+ <div wicket:id="feedback"></div>
+ </form>
+</wicket:panel>
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c384a4a0/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
new file mode 100644
index 0000000..cac56a1
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.admin.users;
+
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.PasswordTextField;
+import org.apache.wicket.model.Model;
+
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
+
+public class PasswordDialog extends AbstractFormDialog<String> {
+ private static final long serialVersionUID = 1L;
+ private DialogButton ok;
+ private DialogButton cancel;
+ protected final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
+ private final Form<String> form = new Form<>("form");
+ private final PasswordTextField pass = new PasswordTextField("password");
+
+ public PasswordDialog(String id) {
+ super(id, "");
+ }
+
+ public UserForm getUserForm() {
+ return findParent(UserForm.class);
+ }
+
+ @Override
+ protected void onInitialize() {
+ setTitle(Model.of(getString("537")));
+ ok = new DialogButton("ok", getString("54"));
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
+ add(form.add(feedback, pass.setRequired(false).setLabel(Model.of(getString("110")))));
+ super.onInitialize();
+ }
+
+ @Override
+ protected List<DialogButton> getButtons() {
+ return Arrays.asList(ok, cancel);
+ }
+
+ @Override
+ public DialogButton getSubmitButton() {
+ return ok;
+ }
+
+ @Override
+ public Form<?> getForm() {
+ return form;
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target) {
+ target.add(feedback);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target, DialogButton button) {
+ if (!form.hasError() || !button.equals(ok)) {
+ super.onClick(target, button);
+ }
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ final UserForm uf = getUserForm();
+ if (uf.isAdminPassRequired()) {
+ final UserDao dao = getBean(UserDao.class);
+ if (dao.verifyPassword(getUserId(), pass.getConvertedInput())) {
+ uf.saveUser(target);
+ } else {
+ form.error(getString("error.bad.password"));
+ target.add(feedback);
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c384a4a0/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
index 01c73a8..7ba2103 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
@@ -65,5 +65,6 @@
<form wicket:id="comunity"></form>
</fieldset>
</div>
+ <div wicket:id="adminPass"></div>
</wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c384a4a0/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 9ae0c46..00a1733 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.admin.users;
+import static org.apache.openmeetings.db.util.AuthLevelUtil.hasAdminLevel;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel;
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
@@ -33,6 +34,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import org.apache.openmeetings.core.util.StrongPasswordValidator;
@@ -45,6 +47,7 @@ import org.apache.openmeetings.db.entity.server.OAuthServer;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.entity.user.User.Type;
+import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.service.mail.EmailManager;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.common.ComunityUserForm;
@@ -92,6 +95,7 @@ public class UserForm extends AdminBaseForm<User> {
private final PasswordTextField password = new PasswordTextField("password", new Model<String>());
private final MessageDialog warning;
private final DropDownChoice<Long> domainId = new DropDownChoice<>("domainId");
+ private final PasswordDialog adminPass = new PasswordDialog("adminPass");
public UserForm(String id, WebMarkupContainer listContainer, final User user, MessageDialog warning) {
super(id, new CompoundPropertyModel<>(user));
@@ -165,6 +169,7 @@ public class UserForm extends AdminBaseForm<User> {
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
+ add(adminPass);
}
@Override
@@ -177,25 +182,44 @@ public class UserForm extends AdminBaseForm<User> {
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
+ if (isAdminPassRequired()) {
+ adminPass.open(target);
+ } else {
+ saveUser(target);
+ }
+ }
+
+ private static boolean checkLevel(Set<User.Right> rights) {
+ return hasAdminLevel(rights) || AuthLevelUtil.hasWebServiceLevel(rights);
+ }
+
+ boolean isAdminPassRequired() {
User u = getModelObject();
+ UserDao dao = getBean(UserDao.class);
+ User ou = dao.get(u.getId());
+ return checkLevel(u.getRights()) || (ou != null && checkLevel(ou.getRights()));
+ }
+
+ void saveUser(AjaxRequestTarget target) {
+ User u = getModelObject();
+ final UserDao dao = getBean(UserDao.class);
+ final boolean isNew = u.getId() == null;
+ boolean sendEmailAtRegister = getBean(ConfigurationDao.class).getBool(CONFIG_EMAIL_AT_REGISTER, false);
+ if (isNew && sendEmailAtRegister) {
+ u.setActivatehash(UUID.randomUUID().toString());
+ }
try {
- boolean isNew = u.getId() == null;
- boolean sendEmailAtRegister = getBean(ConfigurationDao.class).getBool(CONFIG_EMAIL_AT_REGISTER, false);
- if (isNew && sendEmailAtRegister) {
- u.setActivatehash(UUID.randomUUID().toString());
- }
- u = getBean(UserDao.class).update(u, password.getConvertedInput(), getUserId());
- if (isNew && sendEmailAtRegister) {
- String email = u.getAddress().getEmail();
- getBean(EmailManager.class).sendMail(login.getValue(), email, u.getActivatehash(), false, null);
- }
+ u = dao.update(u, password.getConvertedInput(), getUserId());
} catch (Exception e) {
log.error("[onSaveSubmit]: ", e);
}
- setModelObject(getBean(UserDao.class).get(u.getId()));
+ if (isNew && sendEmailAtRegister) {
+ String email = u.getAddress().getEmail();
+ getBean(EmailManager.class).sendMail(login.getValue(), email, u.getActivatehash(), false, null);
+ }
+ setModelObject(dao.get(u.getId()));
hideNewRecord();
- target.add(this);
- target.add(listContainer);
+ target.add(this, listContainer);
reinitJs(target);
if (u.getGroupUsers().isEmpty()) {
warning.open(target);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c384a4a0/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
index 7abda78..27118ef 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
@@ -28,13 +28,17 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public abstract class FormSaveRefreshPanel<T> extends Panel {
private static final long serialVersionUID = 1L;
- protected final KendoFeedbackPanel feedback;
+ private final Form<T> form;
+ protected final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
public FormSaveRefreshPanel(String id, Form<T> form) {
super(id);
+ this.form = form;
setOutputMarkupId(true);
+ }
- feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
+ @Override
+ protected void onInitialize() {
add(feedback.setOutputMarkupId(true));
// add a save button that can be used to submit the form via ajax
@@ -76,8 +80,9 @@ public abstract class FormSaveRefreshPanel<T> extends Panel {
onRefreshError(target, form);
}
});
-
+ super.onInitialize();
}
+
/**
* Hide the new record text
*/
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c384a4a0/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
index ef9e252..500bd0c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
@@ -21,7 +21,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<form wicket:id="form">
- <label style="padding-left: 20px; padding-right: 20px;" wicket:id="label"></label><input type="text" wicket:id="title"/>
+ <label style="padding: 0 20px;" wicket:id="label"></label><input type="text" wicket:id="title"/>
<div wicket:id="feedback"></div>
<input type="submit" wicket:id="submit" class="invisible-form-component"/>
</form>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c384a4a0/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
index b5d66c8..14e6b03 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
@@ -1,6 +1,6 @@
/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
var Activities = function() {
- const closedHeight = 20, closedHeightPx = closedHeight + 'px', timeout = 10000;
+ const closedHeight = 20, timeout = 10000;
let activities, aclean, area, openedHeight = 345, openedHeightPx = openedHeight + 'px', inited = false;
function _load() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c384a4a0/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
index adb6660..0d4a8cf 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
@@ -211,7 +211,6 @@ var Chat = function() {
if ($('#chat').length > 0 && m && m.type === "chat") {
if (isClosed()) {
ctrl.addClass('ui-state-highlight');
- const s = _load();
if (p.is(':visible') && !muted) {
const playPromise = audio.play();
[12/13] openmeetings git commit: Merge branch '4.0.x' into
wicket-defer-all
Posted by so...@apache.org.
Merge branch '4.0.x' into wicket-defer-all
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/2b571fe2
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/2b571fe2
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/2b571fe2
Branch: refs/heads/wicket-defer-all
Commit: 2b571fe2d4770326dc4424893f6464945389e5aa
Parents: e6eddcb 2bcafa6
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Jan 26 10:25:54 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jan 26 10:25:54 2018 +0700
----------------------------------------------------------------------
.../openmeetings/backup/BackupImport.java | 6 +-
.../backup/converter/WbConverter.java | 29 +++--
openmeetings-server/src/site/xdoc/security.xml | 13 ++
.../org/apache/openmeetings/web/admin/admin.js | 2 +-
.../web/admin/users/PasswordDialog.html | 28 +++++
.../web/admin/users/PasswordDialog.java | 118 +++++++++++++++++++
.../openmeetings/web/admin/users/UserForm.html | 1 +
.../openmeetings/web/admin/users/UserForm.java | 65 +++++++---
.../web/app/Application.properties.xml | 2 +-
.../web/app/Application_ar.properties.xml | 2 +-
.../web/app/Application_bg.properties.xml | 2 +-
.../web/app/Application_ca.properties.xml | 2 +-
.../web/app/Application_cs.properties.xml | 2 +-
.../web/app/Application_da.properties.xml | 2 +-
.../web/app/Application_de.properties.xml | 26 ++--
.../web/app/Application_el.properties.xml | 2 +-
.../web/app/Application_es.properties.xml | 2 +-
.../web/app/Application_fa.properties.xml | 2 +-
.../web/app/Application_fi.properties.xml | 2 +-
.../web/app/Application_fr.properties.xml | 2 +-
.../web/app/Application_gl.properties.xml | 2 +-
.../web/app/Application_he.properties.xml | 2 +-
.../web/app/Application_hu.properties.xml | 2 +-
.../web/app/Application_id.properties.xml | 2 +-
.../web/app/Application_it.properties.xml | 2 +-
.../web/app/Application_ja.properties.xml | 2 +-
.../web/app/Application_ko.properties.xml | 2 +-
.../web/app/Application_nl.properties.xml | 2 +-
.../web/app/Application_pl.properties.xml | 2 +-
.../web/app/Application_pt.properties.xml | 2 +-
.../web/app/Application_pt_BR.properties.xml | 2 +-
.../web/app/Application_sk.properties.xml | 2 +-
.../web/app/Application_sv.properties.xml | 2 +-
.../web/app/Application_th.properties.xml | 2 +-
.../web/app/Application_tr.properties.xml | 2 +-
.../web/app/Application_uk.properties.xml | 2 +-
.../web/app/Application_zh_CN.properties.xml | 2 +-
.../web/app/Application_zh_TW.properties.xml | 2 +-
.../web/common/FormSaveRefreshPanel.java | 11 +-
.../openmeetings/web/common/NameDialog.html | 2 +-
.../web/room/activities/activities.js | 2 +-
.../apache/openmeetings/web/room/room-base.js | 8 +-
.../web/user/calendar/calendar-functions.js | 2 +-
.../openmeetings/web/user/chat/chat-base.js | 1 -
pom.xml | 6 +-
45 files changed, 297 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
[10/13] openmeetings git commit: [OPENMEETINGS-1777] tomcat version
is updated
Posted by so...@apache.org.
[OPENMEETINGS-1777] tomcat version is updated
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1ec0fcaa
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1ec0fcaa
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1ec0fcaa
Branch: refs/heads/wicket-defer-all
Commit: 1ec0fcaa782710f69dc314155fea91137f4957e3
Parents: 33e8f23
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Jan 24 10:40:55 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Jan 24 10:40:55 2018 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ec0fcaa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f62be71..e4ebfae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
<red5-client.version>1.0.10-M4</red5-client.version>
<spring.version>4.3.13.RELEASE</spring.version>
<mina.version>2.0.16</mina.version>
- <tomcat.version>9.0.2</tomcat.version>
+ <tomcat.version>9.0.4</tomcat.version>
<ical4j.version>2.1.5</ical4j.version>
<cxf.version>3.2.1</cxf.version>
<selenium.version>3.8.1</selenium.version>
[05/13] openmeetings git commit: [OPENMEETINGS-1773] saved WB import
is fixed
Posted by so...@apache.org.
[OPENMEETINGS-1773] saved WB import is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d0512ba2
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d0512ba2
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d0512ba2
Branch: refs/heads/wicket-defer-all
Commit: d0512ba2eced6132da43ea79390299b1db3f21dc
Parents: 9922eec
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Jan 11 22:14:20 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Jan 11 22:14:20 2018 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/backup/BackupImport.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d0512ba2/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 8e2c015..83f05d0 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -424,6 +424,9 @@ public class BackupImport {
if (ver.compareTo(BackupVersion.get("4.0.0")) < 0) {
for (BaseFileItem bfi : files) {
+ if (bfi.isDeleted()) {
+ continue;
+ }
if (BaseFileItem.Type.Presentation == bfi.getType()) {
convertOldPresentation((FileItem)bfi);
}
@@ -487,7 +490,7 @@ public class BackupImport {
if (CONFIG_CRYPT.equals(c.getKey())) {
try {
Class<?> clazz = Class.forName(c.getValue());
- clazz.newInstance();
+ clazz.getDeclaredConstructor().newInstance();
} catch (Exception e) {
log.warn("Not existing Crypt class found {}, replacing with SCryptImplementation", c.getValue());
c.setValue(SCryptImplementation.class.getCanonicalName());
[03/13] openmeetings git commit: no jira: security page is updated
with CVE-2017-5878 details
Posted by so...@apache.org.
no jira: security page is updated with CVE-2017-5878 details
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/f95b6321
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f95b6321
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f95b6321
Branch: refs/heads/wicket-defer-all
Commit: f95b6321d7dc5dd14cfb48871b16fc80c858e25a
Parents: c384a4a
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Jan 11 17:10:06 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Jan 11 17:10:06 2018 +0700
----------------------------------------------------------------------
openmeetings-server/src/site/xdoc/security.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f95b6321/openmeetings-server/src/site/xdoc/security.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/security.xml b/openmeetings-server/src/site/xdoc/security.xml
index be1d7f3..cc09e75 100644
--- a/openmeetings-server/src/site/xdoc/security.xml
+++ b/openmeetings-server/src/site/xdoc/security.xml
@@ -173,6 +173,19 @@
All users are recommended to upgrade to Apache OpenMeetings 3.3.0</p>
<p>Credit: This issue was identified by Security Innovation</p>
</section>
+ <section name="CVE-2017-5878 - RED5/AMF Unmarshalling RCE">
+ <p>Severity: Critical</p>
+ <p>Vendor: Red5</p>
+ <p>Versions Affected: Apache OpenMeetings 3.1.3 and earlier</p>
+ <p>Description: The AMF unmarshallers in Red5 Media Server before 1.0.8 do not restrict the
+ classes for which it performs deserialization, which allows remote attackers to execute
+ arbitrary code via crafted serialized Java data.<br/>
+ <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5878">CVE-2017-5878</a>
+ </p>
+ <p>The issue was fixed in 3.1.4<br/>
+ All users are recommended to upgrade to Apache OpenMeetings 3.1.4</p>
+ <p>Credit: This issue was identified by Moritz Bechler</p>
+ </section>
<section name="CVE-2016-8736 - Apache Openmeetings RMI Registry Java Deserialization RCE">
<p>Severity: Moderate</p>
<p>Vendor: The Apache Software Foundation</p>
[06/13] openmeetings git commit: [OPENMEETINGS-1812] admin password
is checked during delete of privileged user
Posted by so...@apache.org.
[OPENMEETINGS-1812] admin password is checked during delete of privileged user
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/88c4d903
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/88c4d903
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/88c4d903
Branch: refs/heads/wicket-defer-all
Commit: 88c4d9037d8837cbfa6dc9ed15355cc49a493e33
Parents: d0512ba
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Jan 11 22:52:46 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Jan 11 22:52:46 2018 +0700
----------------------------------------------------------------------
.../web/admin/users/PasswordDialog.java | 19 +++++++++++++++++--
.../openmeetings/web/admin/users/UserForm.java | 15 +++++++++++++--
2 files changed, 30 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/88c4d903/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
index cac56a1..641ed8a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.java
@@ -26,9 +26,11 @@ import java.util.List;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.model.Model;
+import org.danekja.java.util.function.serializable.SerializableConsumer;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
@@ -42,6 +44,7 @@ public class PasswordDialog extends AbstractFormDialog<String> {
protected final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final Form<String> form = new Form<>("form");
private final PasswordTextField pass = new PasswordTextField("password");
+ private SerializableConsumer<AjaxRequestTarget> action = null;
public PasswordDialog(String id) {
super(id, "");
@@ -56,7 +59,7 @@ public class PasswordDialog extends AbstractFormDialog<String> {
setTitle(Model.of(getString("537")));
ok = new DialogButton("ok", getString("54"));
cancel = new DialogButton("cancel", getString("lbl.cancel"));
- add(form.add(feedback, pass.setRequired(false).setLabel(Model.of(getString("110")))));
+ add(form.add(feedback, pass.setRequired(false).setLabel(Model.of(getString("110"))).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true)));
super.onInitialize();
}
@@ -81,19 +84,31 @@ public class PasswordDialog extends AbstractFormDialog<String> {
}
@Override
+ protected void onOpen(IPartialPageRequestHandler handler) {
+ handler.add(pass.setModelObject(""));
+ super.onOpen(handler);
+ }
+
+ @Override
public void onClick(AjaxRequestTarget target, DialogButton button) {
if (!form.hasError() || !button.equals(ok)) {
super.onClick(target, button);
}
}
+ public void setAction(SerializableConsumer<AjaxRequestTarget> action) {
+ this.action = action;
+ }
+
@Override
protected void onSubmit(AjaxRequestTarget target) {
final UserForm uf = getUserForm();
if (uf.isAdminPassRequired()) {
final UserDao dao = getBean(UserDao.class);
if (dao.verifyPassword(getUserId(), pass.getConvertedInput())) {
- uf.saveUser(target);
+ if (action != null) {
+ action.accept(target);
+ }
} else {
form.error(getString("error.bad.password"));
target.add(feedback);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/88c4d903/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 00a1733..a911d88 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -71,6 +71,7 @@ import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
+import org.danekja.java.util.function.serializable.SerializableConsumer;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.wicketstuff.select2.Response;
@@ -183,6 +184,7 @@ public class UserForm extends AdminBaseForm<User> {
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
if (isAdminPassRequired()) {
+ adminPass.setAction((SerializableConsumer<AjaxRequestTarget>)t -> saveUser(t));
adminPass.open(target);
} else {
saveUser(target);
@@ -245,14 +247,23 @@ public class UserForm extends AdminBaseForm<User> {
update(target);
}
- @Override
- protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
+ private void deleteUser(AjaxRequestTarget target) {
UserDao userDao = getBean(UserDao.class);
userDao.delete(getModelObject(), getUserId());
setModelObject(userDao.getNewUserInstance(userDao.get(getUserId())));
update(target);
}
+ @Override
+ protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
+ if (isAdminPassRequired()) {
+ adminPass.setAction((SerializableConsumer<AjaxRequestTarget>)t -> deleteUser(t));
+ adminPass.open(target);
+ } else {
+ deleteUser(target);
+ }
+ }
+
public void updateDomain(AjaxRequestTarget target) {
User u = getModelObject();
final Map<Long, String> values = new HashMap<>();
[07/13] openmeetings git commit: [OPENMEETINGS-1773] saved WB import
is further fixed
Posted by so...@apache.org.
[OPENMEETINGS-1773] saved WB import is further fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/ffde6971
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ffde6971
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ffde6971
Branch: refs/heads/wicket-defer-all
Commit: ffde6971b4a2639268f0058a2d4aa17d55d23a2a
Parents: 88c4d90
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Jan 12 12:38:19 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jan 12 12:38:19 2018 +0700
----------------------------------------------------------------------
.../backup/converter/WbConverter.java | 29 ++++++++++++++------
1 file changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ffde6971/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
index da30ec9..d2b6025 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
@@ -39,6 +39,7 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
+import org.apache.commons.lang.math.NumberUtils;
import org.apache.openmeetings.db.dto.room.Whiteboard;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.FileItem;
@@ -99,7 +100,7 @@ public class WbConverter {
if (props.size() < 12) {
return;
}
- String color = getColor((Integer)props.get(2));
+ String color = getColor(getInt(props, 2));
String style = (String)props.get(4);
JSONObject o = setColor(init(wb, props), color, color)
.put(ATTR_TYPE, "i-text")
@@ -118,7 +119,7 @@ public class WbConverter {
if (props.size() < 13) {
return;
}
- String color = getColor((Integer)props.get(4));
+ String color = getColor(getInt(props, 4));
JSONObject o = setColor(init(wb, props), color, null)
.put(ATTR_TYPE, "path")
.put(ATTR_STROKE, props.get(3));
@@ -127,13 +128,13 @@ public class WbConverter {
JSONArray path = new JSONArray();
for (List<?> point : points) {
if (path.length() == 0) {
- path.put(new JSONArray(Arrays.asList("M", (Integer)point.get(1), (Integer)point.get(2))));
+ path.put(new JSONArray(Arrays.asList("M", getInt(point, 1), getInt(point, 2))));
} else if (path.length() == points.size() - 1) {
- path.put(new JSONArray(Arrays.asList("L", (Integer)point.get(3), (Integer)point.get(4))));
+ path.put(new JSONArray(Arrays.asList("L", getInt(point, 3), getInt(point, 4))));
} else {
path.put(new JSONArray(Arrays.asList("Q"
- , (Integer)point.get(1), (Integer)point.get(2)
- , (Integer)point.get(3), (Integer)point.get(4))));
+ , getInt(point, 1), getInt(point, 2)
+ , getInt(point, 3), getInt(point, 4))));
}
}
add(wb, o.put("path", path).put(ATTR_OPACITY, props.get(5)));
@@ -143,7 +144,7 @@ public class WbConverter {
if (props.size() < 16) {
return;
}
- String color = getColor((Integer)props.get(1));
+ String color = getColor(getInt(props, 1));
add(wb, setColor(init(wb, props), color, color)
.put(ATTR_TYPE, "line")
.put(ATTR_STROKE, props.get(2))
@@ -154,13 +155,23 @@ public class WbConverter {
.put("y2", props.get(7)));
}
+ private static int getInt(List<?> props, int idx) {
+ Object o = props.get(idx);
+ if (o instanceof Number) {
+ return ((Number) o).intValue();
+ } else if (o instanceof String) {
+ return NumberUtils.toInt((String)o);
+ }
+ return 0;
+ }
+
private static JSONObject processRect(Whiteboard wb, List<?> props) {
if (props.size() < 15) {
return null;
}
return setColor(init(wb, props)
- , 1 == (Integer)props.get(4) ? getColor((Integer)props.get(1)) : null
- , 1 == (Integer)props.get(5) ? getColor((Integer)props.get(3)) : null)
+ , 1 == getInt(props, 4) ? getColor(getInt(props, 1)) : null
+ , 1 == getInt(props, 5) ? getColor(getInt(props, 3)) : null)
.put(ATTR_TYPE, "rect")
.put(ATTR_STROKE, props.get(2))
.put(ATTR_OPACITY, props.get(6));