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 <solomax...@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(-)