Merge branch '4.0.x' into OPENMEETINGS-1791-quick-poll
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/2ab24ffa Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/2ab24ffa Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/2ab24ffa Branch: refs/heads/OPENMEETINGS-1791-quick-poll Commit: 2ab24ffa518d8f018ae0e782d16004b5f97e65a8 Parents: 613d94f c384a4a Author: Maxim Solodovnik <[email protected]> Authored: Sat Jan 6 19:02:32 2018 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Jan 6 19:02:32 2018 +0700 ---------------------------------------------------------------------- .../web/admin/users/PasswordDialog.html | 28 +++++ .../web/admin/users/PasswordDialog.java | 103 +++++++++++++++++++ .../openmeetings/web/admin/users/UserForm.html | 1 + .../openmeetings/web/admin/users/UserForm.java | 50 ++++++--- .../web/common/FormSaveRefreshPanel.java | 11 +- .../openmeetings/web/common/NameDialog.html | 2 +- .../web/room/activities/activities.js | 2 +- .../openmeetings/web/user/chat/chat-base.js | 1 - 8 files changed, 179 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
