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 2022/04/21 08:52:39 UTC
[openmeetings] 01/02: Merge branch 'master' into java11-modules
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit a7e96f8b97e9631897d30a51cdc06a50002aa09d
Merge: 7f6f9fdb5 ffa7b7b7b
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Apr 21 14:32:43 2022 +0700
Merge branch 'master' into java11-modules
.../openmeetings/db/dao/file/BaseFileItemDao.java | 28 ++++--
.../openmeetings/db/dao/file/FileItemDao.java | 5 -
.../openmeetings/db/dao/record/RecordingDao.java | 5 -
.../openmeetings/db/entity/file/BaseFileItem.java | 1 +
.../openmeetings/db/entity/label/OmLanguage.java | 4 +-
.../apache/openmeetings/db/util/FormatHelper.java | 40 --------
.../apache/openmeetings/backup/BackupImport.java | 2 +-
.../org/apache/openmeetings/cli/CleanupHelper.java | 4 +-
.../installation/ImportInitvalues.java | 1 +
openmeetings-server/pom.xml | 2 +-
.../src/main/assembly/components/all.xml | 1 +
.../src/main/assembly/conf/context.xml | 34 +++++++
.../src/main/assembly/scripts/admin.bat | 4 +-
.../src/main/assembly/scripts/admin.sh | 6 +-
.../service/calendar/caldav/IcalUtils.java | 111 +++++++++------------
.../mail/template/AbstractTemplatePanel.java | 4 +-
.../openmeetings/util/OpenmeetingsVariables.java | 2 +-
.../apache/openmeetings/util/mail/IcalHandler.java | 6 +-
.../apache/openmeetings/web/common/BasePanel.java | 3 +-
.../openmeetings/web/pages/BaseInitedPage.java | 3 +-
.../openmeetings/web/pages/BaseNotInitedPage.java | 7 +-
.../web/user/dashboard/OmDashboardPanel.java | 4 +-
.../WEB-INF/classes/META-INF/h2_persistence.xml | 5 +-
.../web/test/backup/TestImportOld.java | 4 +-
pom.xml | 110 +++++++++-----------
25 files changed, 176 insertions(+), 220 deletions(-)
diff --cc openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
index ddd8113c1,ee4c982b4..dc549ea4f
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
@@@ -18,12 -18,10 +18,10 @@@
*/
package org.apache.openmeetings.service.mail.template;
- import static org.apache.openmeetings.db.util.FormatHelper.isRtlLanguage;
-
import java.util.Locale;
-import org.apache.openmeetings.IApplication;
-import org.apache.openmeetings.IWebSession;
+import org.apache.openmeetings.db.IApplication;
+import org.apache.openmeetings.db.IWebSession;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;