Merge branch 'reflow-branch' into 4.0.x
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/8d266446 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8d266446 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8d266446 Branch: refs/heads/4.0.x Commit: 8d26644631b9679fd83efbe6b8fc91af64491825 Parents: 08ae2ae 194b2a2 Author: Maxim Solodovnik <[email protected]> Authored: Fri Dec 8 22:22:03 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Dec 8 22:22:03 2017 +0700 ---------------------------------------------------------------------- openmeetings-server/src/site/resources/css/site.css | 3 --- .../src/site/resources/js/anchor.min.js | 6 ++++++ openmeetings-server/src/site/resources/js/site.js | 10 ---------- openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml | 6 +++--- openmeetings-server/src/site/xdoc/index.xml | 2 +- .../openmeetings/webservice/CalendarWebService.java | 15 ++++----------- .../openmeetings/webservice/FileWebService.java | 6 ++++-- .../openmeetings/webservice/GroupWebService.java | 11 +++++------ .../openmeetings/webservice/RecordingWebService.java | 2 +- .../openmeetings/webservice/RoomWebService.java | 1 + pom.xml | 4 ++-- src/site/site.xml | 2 +- 12 files changed, 28 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8d266446/pom.xml ----------------------------------------------------------------------
