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 692468ece960d566737dbf057255a6b39dc6d9b6 Merge: 81e95ac 68ea4c2 Author: Maxim Solodovnik <[email protected]> AuthorDate: Fri Feb 28 09:12:23 2020 +0700 Merge branch 'csp' openmeetings-core/pom.xml | 1 + openmeetings-db/pom.xml | 1 + .../apache/openmeetings/db/dao/user/UserDao.java | 5 +- .../apache/openmeetings/db/entity/user/User.java | 9 +- openmeetings-install/pom.xml | 1 + .../apache/openmeetings/backup/BackupExport.java | 108 ++-- .../apache/openmeetings/backup/BackupImport.java | 24 +- .../java/org/apache/openmeetings/cli/Admin.java | 2 +- openmeetings-screenshare/pom.xml | 1 + openmeetings-server/pom.xml | 1 + openmeetings-service/pom.xml | 1 + openmeetings-util/pom.xml | 1 + openmeetings-web/pom.xml | 16 + .../openmeetings/web/admin/AdminActionsPanel.html | 14 +- .../openmeetings/web/admin/AdminActionsPanel.java | 32 +- .../openmeetings/web/admin/AdminBasePanel.java | 2 +- .../openmeetings/web/admin/backup/BackupPanel.html | 31 +- .../openmeetings/web/admin/backup/BackupPanel.java | 202 ++++--- .../web/admin/configurations/ConfigForm.java | 35 +- .../web/admin/configurations/ConfigsPanel.html | 79 +-- .../web/admin/configurations/admin-config.js | 32 ++ .../web/admin/connection/ConnectionsPanel.html | 10 +- .../web/admin/connection/ConnectionsPanel.java | 27 +- .../openmeetings/web/admin/email/EmailForm.java | 42 +- .../openmeetings/web/admin/email/EmailPanel.html | 54 +- .../openmeetings/web/admin/email/EmailPanel.java | 2 +- .../web/admin/groups/GroupUsersPanel.html | 10 +- .../web/admin/groups/GroupUsersPanel.java | 30 +- .../openmeetings/web/admin/groups/GroupsPanel.html | 49 +- .../web/admin/labels/AddLanguageDialog.html | 4 +- .../web/admin/labels/AddLanguageDialog.java | 93 ++-- .../openmeetings/web/admin/labels/LabelsForm.java | 6 - .../openmeetings/web/admin/labels/LangPanel.html | 67 +-- .../openmeetings/web/admin/labels/LangPanel.java | 57 +- .../openmeetings/web/admin/ldaps/LdapsPanel.html | 50 +- .../openmeetings/web/admin/oauth/OAuthForm.java | 40 +- .../openmeetings/web/admin/oauth/OAuthPanel.html | 113 ++-- .../openmeetings/web/admin/rooms/RoomForm.java | 102 ++-- .../openmeetings/web/admin/rooms/RoomsPanel.html | 203 ++++--- .../web/admin/users/PasswordDialog.html | 6 +- .../web/admin/users/PasswordDialog.java | 94 ++-- .../openmeetings/web/admin/users/UserForm.html | 34 +- .../openmeetings/web/admin/users/UserForm.java | 14 +- .../openmeetings/web/admin/users/UsersPanel.html | 4 +- .../openmeetings/web/admin/users/UsersPanel.java | 23 +- .../apache/openmeetings/web/app/Application.java | 67 ++- .../web/app/Application.properties.xml | 16 +- .../web/app/Application_ar.properties.xml | 16 +- .../web/app/Application_bg.properties.xml | 16 +- .../web/app/Application_bn.properties.xml | 16 +- .../web/app/Application_ca.properties.xml | 16 +- .../web/app/Application_cs.properties.xml | 16 +- .../web/app/Application_da.properties.xml | 16 +- .../web/app/Application_de.properties.xml | 16 +- .../web/app/Application_el.properties.xml | 16 +- .../web/app/Application_es.properties.xml | 16 +- .../web/app/Application_fa.properties.xml | 16 +- .../web/app/Application_fi.properties.xml | 16 +- .../web/app/Application_fr.properties.xml | 16 +- .../web/app/Application_gl.properties.xml | 16 +- .../web/app/Application_he.properties.xml | 16 +- .../web/app/Application_hu.properties.xml | 14 +- .../web/app/Application_in.properties.xml | 16 +- .../web/app/Application_it.properties.xml | 16 +- .../web/app/Application_ja.properties.xml | 16 +- .../web/app/Application_ko.properties.xml | 16 +- .../web/app/Application_nl.properties.xml | 16 +- .../web/app/Application_pl.properties.xml | 16 +- .../web/app/Application_pt.properties.xml | 16 +- .../web/app/Application_pt_BR.properties.xml | 16 +- .../web/app/Application_ru.properties.xml | 16 +- .../web/app/Application_sk.properties.xml | 16 +- .../web/app/Application_sv.properties.xml | 16 +- .../web/app/Application_th.properties.xml | 16 +- .../web/app/Application_tr.properties.xml | 16 +- .../web/app/Application_uk.properties.xml | 16 +- .../web/app/Application_zh_CN.properties.xml | 16 +- .../web/app/Application_zh_TW.properties.xml | 16 +- .../apache/openmeetings/web/app/WebSession.java | 6 +- .../web/common/AbstractOmDateTimePicker.java | 74 +++ .../{OmButton.java => AjaxOmDatePicker.java} | 31 +- .../apache/openmeetings/web/common/BasePanel.java | 6 +- .../apache/openmeetings/web/common/Captcha.html | 6 +- .../apache/openmeetings/web/common/Captcha.java | 16 +- .../openmeetings/web/common/ComunityUserForm.html | 34 +- .../web/common/ConfirmableAjaxBorder.html | 27 - .../web/common/ConfirmableAjaxBorder.java | 200 ------- .../openmeetings/web/common/FormActionsPanel.html | 14 +- .../openmeetings/web/common/FormActionsPanel.java | 34 +- .../openmeetings/web/common/GeneralUserForm.html | 49 +- .../openmeetings/web/common/GeneralUserForm.java | 28 +- .../openmeetings/web/common/InvitationDialog.html | 4 +- .../openmeetings/web/common/InvitationDialog.java | 111 ++-- .../openmeetings/web/common/InvitationForm.html | 4 +- .../openmeetings/web/common/InvitationForm.java | 27 +- .../apache/openmeetings/web/common/MainPanel.html | 27 +- .../apache/openmeetings/web/common/MainPanel.java | 45 +- .../apache/openmeetings/web/common/NameDialog.html | 6 +- .../apache/openmeetings/web/common/NameDialog.java | 86 ++- .../openmeetings/web/common/OmDateTimePicker.java | 29 +- .../OmModalCloseButton.java} | 23 +- .../openmeetings/web/common/OmPagingNavigator.html | 8 +- .../web/common/PagedEntityListPanel.html | 8 +- .../web/common/PagedEntityListPanel.java | 19 +- .../web/common/PagingNavigatorPanel.html | 8 +- .../web/common/PagingNavigatorPanel.java | 18 +- .../web/common/UploadableImagePanel.html | 25 +- .../web/common/UploadableImagePanel.java | 24 +- .../confirmation/ConfirmableAjaxBorder.html} | 7 +- .../common/confirmation/ConfirmableAjaxBorder.java | 136 +++++ .../common/confirmation/ConfirmationBehavior.java | 84 +++ .../common/confirmation/ConfirmationConfig.java | 116 ++++ .../common/confirmation/ConfirmationDialog.java | 77 +++ .../common/confirmation/bootstrap-confirmation.js | 597 +++++++++++++++++++++ .../org/apache/openmeetings/web/common/main.js | 28 +- .../openmeetings/web/common/menu/MenuPanel.html | 2 +- .../openmeetings/web/common/menu/MenuPanel.java | 32 +- .../openmeetings/web/common/menu/OmMenuItem.java | 87 ++- .../openmeetings/web/common/menu/RoomMenuItem.java | 6 +- .../web/common/tree/ConvertingErrorsDialog.html | 26 +- .../web/common/tree/ConvertingErrorsDialog.java | 51 +- .../web/common/tree/DownloadMenuItem.java | 60 --- .../web/common/tree/FileItemPanel.html | 2 +- .../web/common/tree/FileItemPanel.java | 2 +- .../web/common/tree/FileTreePanel.html | 23 +- .../web/common/tree/FileTreePanel.java | 155 ++++-- .../openmeetings/web/common/tree/FolderPanel.java | 10 +- .../openmeetings/web/common/tree/filetree.js | 37 +- .../openmeetings/web/pages/AccessDeniedPage.html | 10 +- .../openmeetings/web/pages/AccessDeniedPage.java | 8 +- .../apache/openmeetings/web/pages/BasePage.html | 40 +- .../apache/openmeetings/web/pages/BasePage.java | 31 +- .../openmeetings/web/pages/BasePage.properties | 6 +- .../apache/openmeetings/web/pages/HashPage.java | 47 +- .../web/pages/InvitationPasswordDialog.html | 4 +- .../web/pages/InvitationPasswordDialog.java | 93 ++-- .../apache/openmeetings/web/pages/MainPage.html | 2 +- .../apache/openmeetings/web/pages/MainPage.java | 11 +- .../apache/openmeetings/web/pages/PrivacyPage.html | 38 +- .../apache/openmeetings/web/pages/ResetPage.html | 1 + .../apache/openmeetings/web/pages/ResetPage.java | 19 +- .../web/pages/auth/ForgetPasswordDialog.html | 55 +- .../web/pages/auth/ForgetPasswordDialog.java | 245 +++++---- .../web/pages/auth/KickMessageDialog.html | 30 -- .../web/pages/auth/KickMessageDialog.java | 62 --- .../web/pages/auth/RegisterDialog.html | 69 ++- .../web/pages/auth/RegisterDialog.java | 163 +++--- .../web/pages/auth/ResetPasswordDialog.html | 33 +- .../web/pages/auth/ResetPasswordDialog.java | 119 ++-- .../openmeetings/web/pages/auth/SignInDialog.html | 87 +-- .../openmeetings/web/pages/auth/SignInDialog.java | 284 +++++----- .../openmeetings/web/pages/auth/SignInPage.html | 17 +- .../openmeetings/web/pages/auth/SignInPage.java | 85 ++- .../web/pages/install/CongratulationsPanel.html | 12 +- .../web/pages/install/InstallWizard$DbStep.html | 4 +- .../pages/install/InstallWizard$InstallStep.html | 2 +- .../pages/install/InstallWizard$ParamsStep1.html | 4 +- .../pages/install/InstallWizard$ParamsStep2.html | 2 +- .../pages/install/InstallWizard$ParamsStep3.html | 2 +- .../pages/install/InstallWizard$ParamsStep4.html | 4 +- .../web/pages/install/InstallWizard.java | 5 +- .../web/pages/install/InstallWizardPage.html | 26 - .../org/apache/openmeetings/web/pages/loader.css | 32 ++ .../openmeetings/web/room/EventDetailDialog.html | 6 +- .../openmeetings/web/room/EventDetailDialog.java | 38 +- .../ResetPage.html => room/IconTextModal.html} | 2 +- .../openmeetings/web/room/IconTextModal.java | 72 +++ .../apache/openmeetings/web/room/NetTestPanel.html | 40 +- .../openmeetings/web/room/NicknameDialog.java | 91 ++-- .../web/room/RedirectMessageDialog.java | 51 +- .../apache/openmeetings/web/room/RoomPanel.html | 25 +- .../apache/openmeetings/web/room/RoomPanel.java | 122 ++--- .../openmeetings/web/room/VideoSettings.html | 135 ++--- .../openmeetings/web/room/VideoSettings.java | 15 +- .../openmeetings/web/room/WaitModeratorDialog.html | 25 - .../openmeetings/web/room/WaitModeratorDialog.java | 57 -- .../web/room/WaitModeratorDialog_ru.html | 25 - .../web/room/activities/ActivitiesPanel.html | 2 +- .../web/room/activities/ActivitiesPanel.java | 23 +- .../openmeetings/web/room/activities/activities.js | 2 +- .../openmeetings/web/room/menu/ActionsSubMenu.java | 45 +- .../web/{common => room/menu}/OmButton.java | 2 +- .../openmeetings/web/room/menu/PollsSubMenu.java | 30 +- .../web/room/menu/RoomInvitationForm.java | 14 +- .../openmeetings/web/room/menu/RoomMenuPanel.html | 4 +- .../openmeetings/web/room/menu/RoomMenuPanel.java | 23 +- .../web/room/menu/SipDialerDialog.java | 78 ++- .../web/room/poll/CreatePollDialog.html | 8 +- .../web/room/poll/CreatePollDialog.java | 73 ++- .../web/room/poll/PollResultsDialog.html | 14 +- .../web/room/poll/PollResultsDialog.java | 163 +++--- .../openmeetings/web/room/poll/VoteDialog.html | 6 +- .../openmeetings/web/room/poll/VoteDialog.java | 111 ++-- .../apache/openmeetings/web/room/raw-nettest.js | 30 +- .../org/apache/openmeetings/web/room/raw-room.js | 39 +- .../apache/openmeetings/web/room/raw-settings.js | 111 +--- .../openmeetings/web/room/raw-video-manager.js | 4 +- .../apache/openmeetings/web/room/raw-video-util.js | 2 +- .../org/apache/openmeetings/web/room/raw-video.js | 2 +- .../web/room/sidebar/RoomFilePanel.java | 5 +- .../openmeetings/web/room/sidebar/RoomSidebar.html | 40 +- .../openmeetings/web/room/sidebar/RoomSidebar.java | 29 +- .../web/room/sidebar/UploadDialog.html | 21 +- .../web/room/sidebar/UploadDialog.java | 161 ++---- .../apache/openmeetings/web/room/wb/WbPanel.html | 47 +- .../apache/openmeetings/web/room/wb/WbPanel.java | 21 +- .../openmeetings/web/room/wb/raw-wb-area-base.js | 2 +- .../apache/openmeetings/web/room/wb/raw-wb-area.js | 149 ++--- .../openmeetings/web/room/wb/raw-wb-board.js | 34 +- .../apache/openmeetings/web/user/AboutDialog.html | 38 +- .../apache/openmeetings/web/user/AboutDialog.java | 33 +- .../web/user/InviteUserMessageDialog.html | 6 +- .../web/user/InviteUserMessageDialog.java | 66 +-- .../web/user/InviteUserToRoomDialog.html | 6 +- .../web/user/InviteUserToRoomDialog.java | 32 +- .../openmeetings/web/user/MessageDialog.html | 19 +- .../openmeetings/web/user/MessageDialog.java | 241 ++++----- .../openmeetings/web/user/OmWysiwygToolbar.html | 85 +++ .../OmWysiwygToolbar.java} | 20 +- .../openmeetings/web/user/UserInfoDialog.html | 4 +- .../openmeetings/web/user/UserInfoDialog.java | 72 ++- .../web/user/calendar/AppointmentDialog.html | 89 ++- .../web/user/calendar/AppointmentDialog.java | 372 ++++++------- .../web/user/calendar/CalendarDialog.html | 47 +- .../web/user/calendar/CalendarDialog.java | 229 +++----- .../user/calendar/CalendarFunctionsBehavior.java | 58 -- .../web/user/calendar/CalendarPanel.html | 6 +- .../web/user/calendar/CalendarPanel.java | 50 +- .../web/user/calendar/calendar-functions.js | 72 ++- .../apache/openmeetings/web/user/chat/Chat.html | 32 +- .../openmeetings/web/user/chat/ChatForm.java | 27 +- .../openmeetings/web/user/chat/ChatPanel.html | 6 +- .../openmeetings/web/user/chat/ChatPanel.java | 7 +- .../openmeetings/web/user/chat/ChatToolbar.html | 73 ++- .../openmeetings/web/user/chat/ChatToolbar.java | 8 +- .../apache/openmeetings/web/user/chat/raw-chat.js | 81 +-- .../web/user/dashboard/RssWidgetView.html | 10 + .../web/user/dashboard/StartWidgetView.html | 4 +- .../web/user/dashboard/StartWidgetView.java | 8 +- .../dashboard/admin/AdminCleanupInfoDialog.html | 40 +- .../dashboard/admin/AdminCleanupInfoDialog.java | 66 ++- .../web/user/dashboard/admin/AdminWidgetView.html | 2 +- .../web/user/dashboard/admin/AdminWidgetView.java | 18 +- .../apache/openmeetings/web/user/dashboard/rss.js | 16 +- .../web/user/profile/ChangePasswordDialog.html | 4 +- .../web/user/profile/ChangePasswordDialog.java | 74 +-- .../web/user/profile/EditProfileForm.html | 57 +- .../web/user/profile/EditProfileForm.java | 14 +- .../web/user/profile/EditProfilePanel.html | 2 +- .../web/user/profile/InvitationDetails.java | 25 +- .../web/user/profile/InvitationsPanel.html | 12 +- .../web/user/profile/InvitationsPanel.java | 2 +- .../web/user/profile/MessagesContactsPanel.html | 97 ++-- .../web/user/profile/MessagesContactsPanel.java | 86 ++- .../web/user/profile/SettingsPanel.java | 36 +- .../web/user/profile/UserProfilePanel.html | 10 +- .../web/user/profile/UserSearchPanel.html | 21 +- .../web/user/profile/UserSearchPanel.java | 6 +- .../web/user/record/RecordingsPanel.html | 2 +- .../web/user/record/RecordingsPanel.java | 7 +- .../openmeetings/web/user/record/VideoInfo.html | 20 +- .../openmeetings/web/user/record/VideoInfo.java | 98 ++-- .../openmeetings/web/user/rooms/RoomListPanel.html | 24 +- .../openmeetings/web/user/rooms/RoomListPanel.java | 37 +- .../openmeetings/web/user/rooms/RoomsPanel.html | 16 +- .../web/user/rooms/RoomsSelectorPanel.html | 2 +- .../web/user/rooms/RoomsSelectorPanel.java | 2 +- .../web/user/rooms/RoomsTabbedPanel.html | 7 +- .../web/user/rooms/RoomsTabbedPanel.java | 34 +- .../web/util/NonClosableMessageDialog.java | 53 -- .../apache/openmeetings/web/util/ThreadHelper.java | 48 ++ openmeetings-web/src/main/webapp/css/raw-admin.css | 141 +---- .../src/main/webapp/css/raw-calendar.css | 34 +- openmeetings-web/src/main/webapp/css/raw-chat.css | 93 ++-- .../src/main/webapp/css/raw-general-rtl.css | 20 +- .../src/main/webapp/css/raw-general.css | 434 ++++++++------- openmeetings-web/src/main/webapp/css/raw-menu.css | 36 +- .../src/main/webapp/css/raw-nettest.css | 60 +-- openmeetings-web/src/main/webapp/css/raw-room.css | 201 ++++--- openmeetings-web/src/main/webapp/css/raw-tree.css | 132 ++--- .../src/main/webapp/css/raw-variables.css | 6 +- openmeetings-web/src/main/webapp/css/raw-wb.css | 56 +- .../org/apache/openmeetings/backup/TestBackup.java | 2 +- .../openmeetings/web/pages/TestHashPage.java | 9 +- openmeetings-webservice/pom.xml | 1 + pom.xml | 47 +- 286 files changed, 6479 insertions(+), 6027 deletions(-) diff --cc pom.xml index 01c6744,3a9f40d..bcdb5ae --- a/pom.xml +++ b/pom.xml @@@ -74,9 -75,10 +75,14 @@@ <forbiddenapis.version>2.7</forbiddenapis.version> <!-- dependency versions --> <junit.version>5.6.0</junit.version> ++<<<<<<< HEAD + <wicket.version>9.0.0-M4</wicket.version> ++======= + <wicket.version>9.0.0-M5-SNAPSHOT</wicket.version> ++>>>>>>> csp <wicketju.version>9.0.0-M4</wicketju.version> - <wickets.version>9.0.0-M4</wickets.version> + <wickets.version>9.0.0-M5-SNAPSHOT</wickets.version> + <wicket-bootstrap.version>5.0.0-M1</wicket-bootstrap.version> <red5-client.version>1.2.3</red5-client.version> <spring.version>5.2.3.RELEASE</spring.version> <mina.version>2.1.3</mina.version>
