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 2021/06/19 17:28:12 UTC
[openmeetings] branch master updated (9be0a78 -> 82d0ff5)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from 9be0a78 [OPENMEETINGS-2604] extra menu import/export
add 8688850 [OPENMEETINGS-2624] datetimes should work with custom locales/formats
add fa251f3 [OPENMEETINGS-2624] calendar go-to date is localized
add 296a6e8 [OPENMEETINGS-2624] fullcalendar is updated
add 26627b8 Merge branch 'master' into OPENMEETINGS-2624-datetime
new 2ea20b9 Merge branch 'master' into OPENMEETINGS-2624-datetime
new 82d0ff5 Merge branch 'OPENMEETINGS-2624-datetime'
The 2 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:
.../web/common/AbstractOmDateTimePicker.java | 89 ------------
.../openmeetings/web/common/GeneralUserForm.java | 1 +
.../openmeetings/web/common/InvitationForm.java | 1 +
.../datetime/AbstractOmDateTimePicker.html} | 5 +-
.../common/datetime/AbstractOmDateTimePicker.java | 153 +++++++++++++++++++++
.../common/{ => datetime}/AjaxOmDatePicker.java | 41 ++++--
.../common/{ => datetime}/OmDateTimePicker.java | 32 ++---
.../web/common/datetime/datepicker-functions.js | 16 +++
.../openmeetings/web/user/MessageDialog.java | 2 +-
.../web/user/calendar/AppointmentDialog.java | 2 +-
.../web/user/calendar/calendar-functions.js | 3 +-
.../org/apache/openmeetings/util/TestDateTime.java | 2 +-
pom.xml | 6 +-
13 files changed, 226 insertions(+), 127 deletions(-)
delete mode 100644 openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AbstractOmDateTimePicker.java
copy openmeetings-web/src/main/java/org/apache/openmeetings/web/{admin/AdminBasePanel.html => common/datetime/AbstractOmDateTimePicker.html} (92%)
create mode 100644 openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
rename openmeetings-web/src/main/java/org/apache/openmeetings/web/common/{ => datetime}/AjaxOmDatePicker.java (58%)
rename openmeetings-web/src/main/java/org/apache/openmeetings/web/common/{ => datetime}/OmDateTimePicker.java (77%)
create mode 100644 openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/datepicker-functions.js
[openmeetings] 01/02: Merge branch 'master' into
OPENMEETINGS-2624-datetime
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 2ea20b917e6b9eabc1a88f4eeb15bdef88cac79b
Merge: 26627b8 9823076
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Jun 18 00:30:48 2021 +0700
Merge branch 'master' into OPENMEETINGS-2624-datetime
openmeetings-server/pom.xml | 2 +-
.../org/apache/openmeetings/web/admin/groups/GroupsPanel.html | 9 +++++++--
.../org/apache/openmeetings/web/admin/groups/GroupsPanel.java | 2 ++
pom.xml | 6 +++---
4 files changed, 13 insertions(+), 6 deletions(-)
diff --cc pom.xml
index dade52f,dd9be71..97dbe74
--- a/pom.xml
+++ b/pom.xml
@@@ -79,12 -79,12 +79,12 @@@
<!-- dependency versions -->
<junit.version>5.7.1</junit.version>
<wicket.version>9.3.0</wicket.version>
- <wicket-jquery-ui.version>9.3.1</wicket-jquery-ui.version>
+ <wicket-jquery-ui.version>9.3.2-SNAPSHOT</wicket-jquery-ui.version>
<wicketstuff.version>9.3.0</wicketstuff.version>
- <wicket-bootstrap.version>5.0.4</wicket-bootstrap.version>
+ <wicket-bootstrap.version>5.0.5-SNAPSHOT</wicket-bootstrap.version>
<font-awesome.version>5.15.2</font-awesome.version>
<spring.version>5.3.8</spring.version>
- <tomcat.version>9.0.46</tomcat.version>
+ <tomcat.version>9.0.48</tomcat.version>
<ical4j.version>3.0.21</ical4j.version>
<cxf.version>3.4.4</cxf.version>
<io.prometheus.version>0.11.0</io.prometheus.version>
[openmeetings] 02/02: Merge branch 'OPENMEETINGS-2624-datetime'
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 82d0ff5cc071de0af87b9cd1ed7eff33595d51c1
Merge: 9be0a78 2ea20b9
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun Jun 20 00:08:34 2021 +0700
Merge branch 'OPENMEETINGS-2624-datetime'
.../web/common/AbstractOmDateTimePicker.java | 89 ------------
.../openmeetings/web/common/GeneralUserForm.java | 1 +
.../openmeetings/web/common/InvitationForm.java | 1 +
.../common/datetime/AbstractOmDateTimePicker.html | 27 ++++
.../common/datetime/AbstractOmDateTimePicker.java | 153 +++++++++++++++++++++
.../common/{ => datetime}/AjaxOmDatePicker.java | 41 ++++--
.../common/{ => datetime}/OmDateTimePicker.java | 32 ++---
.../web/common/datetime/datepicker-functions.js | 16 +++
.../openmeetings/web/user/MessageDialog.java | 2 +-
.../web/user/calendar/AppointmentDialog.java | 2 +-
.../web/user/calendar/calendar-functions.js | 3 +-
.../org/apache/openmeetings/util/TestDateTime.java | 2 +-
pom.xml | 6 +-
13 files changed, 251 insertions(+), 124 deletions(-)