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/10/21 10:04:41 UTC
[openmeetings] 07/10: Merge branch 'master' into new-reflow-site
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 22229466e58bfdf827e8eb83ce95ceb483e72a6c
Merge: c27aff3 89f0245
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Oct 19 12:38:46 2018 +0700
Merge branch 'master' into new-reflow-site
.../openmeetings/core/remote/KurentoHandler.java | 59 +-
openmeetings-db/pom.xml | 5 -
.../openmeetings/db/dao/IDataProviderDao.java | 8 +-
.../db/dao/IGroupAdminDataProviderDao.java | 4 +-
.../apache/openmeetings/db/dao/basic/ChatDao.java | 51 +-
.../db/dao/basic/ConfigurationDao.java | 22 +-
.../openmeetings/db/dao/basic/MailMessageDao.java | 23 +-
.../openmeetings/db/dao/file/FileItemDao.java | 18 +-
.../apache/openmeetings/db/dao/label/LabelDao.java | 10 +-
.../openmeetings/db/dao/room/InvitationDao.java | 62 +-
.../apache/openmeetings/db/dao/room/RoomDao.java | 36 +-
.../openmeetings/db/dao/server/LdapConfigDao.java | 25 +-
.../openmeetings/db/dao/server/OAuth2Dao.java | 24 +-
.../apache/openmeetings/db/dao/user/GroupDao.java | 53 +-
.../openmeetings/db/dao/user/GroupUserDao.java | 35 +-
.../openmeetings/db/dao/user/IUserManager.java | 2 +-
.../db/dao/user/PrivateMessageDao.java | 25 +-
.../db/dao/user/PrivateMessageFolderDao.java | 17 +-
.../openmeetings/db/dao/user/UserContactDao.java | 11 +-
.../apache/openmeetings/db/dao/user/UserDao.java | 52 +-
.../openmeetings/db/entity/room/Invitation.java | 16 +-
.../apache/openmeetings/db}/util/DaoHelper.java | 14 +-
.../openmeetings/web/admin/AdminBasePanel.java | 3 -
.../web/admin/groups/GroupUsersPanel.java | 4 +-
.../openmeetings/web/admin/labels/LangPanel.java | 2 +-
.../web/app/Application.properties.xml | 1 +
.../web/app/Application_ar.properties.xml | 1 +
.../web/app/Application_bg.properties.xml | 1 +
.../web/app/Application_bn.properties.xml | 1 +
.../web/app/Application_ca.properties.xml | 1 +
.../web/app/Application_cs.properties.xml | 1 +
.../web/app/Application_da.properties.xml | 1 +
.../web/app/Application_de.properties.xml | 1 +
.../web/app/Application_el.properties.xml | 1 +
.../web/app/Application_es.properties.xml | 1 +
.../web/app/Application_fa.properties.xml | 1 +
.../web/app/Application_fi.properties.xml | 1 +
.../web/app/Application_fr.properties.xml | 1 +
.../web/app/Application_gl.properties.xml | 1 +
.../web/app/Application_he.properties.xml | 1 +
.../web/app/Application_hu.properties.xml | 1 +
.../web/app/Application_id.properties.xml | 1 +
.../web/app/Application_it.properties.xml | 1 +
.../web/app/Application_ja.properties.xml | 1 +
.../web/app/Application_ko.properties.xml | 1 +
.../web/app/Application_nl.properties.xml | 1 +
.../web/app/Application_pl.properties.xml | 1 +
.../web/app/Application_pt.properties.xml | 1 +
.../web/app/Application_pt_BR.properties.xml | 1 +
.../web/app/Application_ru.properties.xml | 1 +
.../web/app/Application_sk.properties.xml | 1 +
.../web/app/Application_sv.properties.xml | 1 +
.../web/app/Application_th.properties.xml | 1 +
.../web/app/Application_tr.properties.xml | 1 +
.../web/app/Application_uk.properties.xml | 1 +
.../web/app/Application_zh_CN.properties.xml | 1 +
.../web/app/Application_zh_TW.properties.xml | 1 +
.../apache/openmeetings/web/app/UserManager.java | 60 +-
.../apache/openmeetings/web/common/BasePanel.java | 2 +
.../web/data/SearchableDataProvider.java | 4 +-
.../web/data/SearchableGroupAdminDataProvider.java | 4 +-
.../web/user/profile/InvitationsPanel.html | 45 ++
.../web/user/profile/InvitationsPanel.java | 164 ++++
.../web/user/profile/MessagesContactsPanel.java | 4 +-
.../web/user/profile/SettingsPanel.java | 11 +-
.../web/user/profile/UserSearchPanel.java | 2 +-
.../webapp/WEB-INF/classes/applicationContext.xml | 4 +-
.../openmeetings/webservice/RoomWebService.java | 31 +-
.../openmeetings/webservice/UserWebService.java | 19 -
pom.xml | 858 +++++++++++----------
70 files changed, 1052 insertions(+), 769 deletions(-)