This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch OPENMEETINGS-2624-datetime
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from 296a6e8 [OPENMEETINGS-2624] fullcalendar is updated
add 80e769a [OPENMEETINGS-2604] customized extra menu in room
add 55dd5c1 [OPENMEETINGS-2604] label is renamed
new 26627b8 Merge branch 'master' into OPENMEETINGS-2624-datetime
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../openmeetings/db/dao/room/ExtraMenuDao.java | 129 +++++++++++++++++++++
.../apache/openmeetings/db/dao/user/UserDao.java | 2 +-
.../openmeetings/db/entity/room/ExtraMenu.java | 122 +++++++++++++++++++
.../org/apache/openmeetings/db/util/DaoHelper.java | 5 +-
.../web/admin/configurations/ConfigForm.java | 10 +-
.../web/admin/configurations/ConfigsPanel.java | 15 +--
.../web/admin/connection/ConnectionsPanel.java | 51 ++++----
.../openmeetings/web/admin/email/EmailPanel.java | 13 +--
.../openmeetings/web/admin/extra/ExtraForm.java | 113 ++++++++++++++++++
.../openmeetings/web/admin/extra/ExtraPanel.html | 70 +++++++++++
.../EmailPanel.java => extra/ExtraPanel.java} | 66 +++++------
.../openmeetings/web/admin/groups/GroupForm.java | 44 ++++---
.../openmeetings/web/admin/groups/GroupsPanel.java | 17 +--
.../openmeetings/web/admin/labels/LangPanel.java | 15 +--
.../openmeetings/web/admin/ldaps/LdapsPanel.java | 15 +--
.../openmeetings/web/admin/oauth/OAuthPanel.java | 15 +--
.../openmeetings/web/admin/rooms/RoomForm.java | 48 ++++----
.../openmeetings/web/admin/rooms/RoomsPanel.java | 17 +--
.../openmeetings/web/admin/users/UsersPanel.java | 15 +--
.../web/app/Application.properties.xml | 7 +-
.../web/app/Application_ar.properties.xml | 7 +-
.../web/app/Application_bg.properties.xml | 7 +-
.../web/app/Application_bn.properties.xml | 7 +-
.../web/app/Application_ca.properties.xml | 7 +-
.../web/app/Application_cs.properties.xml | 7 +-
.../web/app/Application_da.properties.xml | 7 +-
.../web/app/Application_de.properties.xml | 9 +-
.../web/app/Application_el.properties.xml | 7 +-
.../web/app/Application_es.properties.xml | 7 +-
.../web/app/Application_fa.properties.xml | 7 +-
.../web/app/Application_fi.properties.xml | 7 +-
.../web/app/Application_fr.properties.xml | 7 +-
.../web/app/Application_gl.properties.xml | 7 +-
.../web/app/Application_hi.properties.xml | 7 +-
.../web/app/Application_hu.properties.xml | 7 +-
.../web/app/Application_in.properties.xml | 7 +-
.../web/app/Application_it.properties.xml | 7 +-
.../web/app/Application_iw.properties.xml | 7 +-
.../web/app/Application_ja.properties.xml | 7 +-
.../web/app/Application_ko.properties.xml | 7 +-
.../web/app/Application_ku.properties.xml | 7 +-
.../web/app/Application_lo.properties.xml | 7 +-
.../web/app/Application_nl.properties.xml | 7 +-
.../web/app/Application_pl.properties.xml | 7 +-
.../web/app/Application_pt.properties.xml | 7 +-
.../web/app/Application_pt_BR.properties.xml | 7 +-
.../web/app/Application_ru.properties.xml | 7 +-
.../web/app/Application_sk.properties.xml | 7 +-
.../web/app/Application_sv.properties.xml | 7 +-
.../web/app/Application_ta.properties.xml | 7 +-
.../web/app/Application_th.properties.xml | 7 +-
.../web/app/Application_tk.properties.xml | 7 +-
.../web/app/Application_tr.properties.xml | 7 +-
.../web/app/Application_uk.properties.xml | 7 +-
.../web/app/Application_ur.properties.xml | 7 +-
.../web/app/Application_zh_CN.properties.xml | 7 +-
.../web/app/Application_zh_TW.properties.xml | 7 +-
.../apache/openmeetings/web/app/WebSession.java | 13 +--
.../apache/openmeetings/web/common/BasePanel.java | 1 +
.../openmeetings/web/common/InvitationForm.java | 25 ++--
.../apache/openmeetings/web/common/MainPanel.java | 3 +
.../web/common/PagingNavigatorPanel.java | 21 ++--
.../openmeetings/web/room/menu/ExtrasSubMenu.java | 76 ++++++++++++
.../web/room/menu/RoomInvitationForm.java | 14 +--
.../openmeetings/web/room/menu/RoomMenuPanel.java | 5 +
.../web/room/poll/PollResultsDialog.java | 23 ++--
.../web/room/sidebar/RoomFilePanel.java | 9 +-
.../web/user/calendar/AppointmentDialog.java | 23 ++--
.../web/user/calendar/CalendarPanel.java | 13 +--
.../openmeetings/web/user/chat/ChatToolbar.java | 9 +-
.../web/user/profile/InvitationsPanel.java | 21 ++--
.../web/user/profile/MessagesContactsPanel.java | 60 +++-------
.../openmeetings/web/util/OmUrlFragment.java | 9 ++
.../WEB-INF/classes/META-INF/db2_persistence.xml | 1 +
.../WEB-INF/classes/META-INF/h2_persistence.xml | 1 +
.../WEB-INF/classes/META-INF/mssql_persistence.xml | 1 +
.../WEB-INF/classes/META-INF/mysql_persistence.xml | 1 +
.../classes/META-INF/oracle_persistence.xml | 1 +
.../classes/META-INF/postgresql_persistence.xml | 1 +
.../org/apache/openmeetings/web/TestMainAreas.java | 12 ++
80 files changed, 991 insertions(+), 402 deletions(-)
create mode 100644
openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ExtraMenuDao.java
create mode 100644
openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/ExtraMenu.java
create mode 100644
openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraForm.java
create mode 100644
openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.html
copy
openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/{email/EmailPanel.java
=> extra/ExtraPanel.java} (58%)
create mode 100644
openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ExtrasSubMenu.java
