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 2017/09/14 04:27:02 UTC
[2/2] openmeetings git commit: Merge branch '3.3.x' into
OPENMEETINGS-1671-room-files
Merge branch '3.3.x' into OPENMEETINGS-1671-room-files
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/0a058f6b
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/0a058f6b
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/0a058f6b
Branch: refs/heads/OPENMEETINGS-1671-room-files
Commit: 0a058f6ba3eb0643bebad32cb039037a1843688d
Parents: c452a46 78078ea
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Sep 14 11:26:52 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Sep 14 11:26:52 2017 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/web/room/SwfPanel.html | 16 ----------------
.../java/org/apache/openmeetings/web/room/room.js | 4 ++++
2 files changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0a058f6b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
----------------------------------------------------------------------
diff --cc openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
index 8b4c25a,4f89d2f..75275db
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
@@@ -1,4 -1,22 +1,5 @@@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
+ var HtmlOverflow;
function setRoomSizes() {
var sb = $(".room.sidebar.left")
, w = $(window).width() - sb.width() - 8