[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-1' - 2 commits - debian/changelog loleaflet/dist loolwsd.spec.in

[Andras Timar]

 debian/changelog             |    6 ++++++
 loleaflet/dist/loleaflet.css |    1 +
 loolwsd.spec.in              |    2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit fb27bccbead1b041002c7a91d4d5287e5e14583b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Mar 29 12:08:34 2018 +0200

    Bump package version to 3.1.0-6
    
    Change-Id: Ia2355beeb2aecb8b46dd40516179323843b1341c

diff --git a/debian/changelog b/debian/changelog
index 743144b78..a322e6377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.1.0-6) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool31
+
+ -- Andras Timar <andras.timar at collabora.com>  Thu, 29 Mar 2018 12:00:00 +0200
+
 loolwsd (3.1.0-5) unstable; urgency=medium
 
   * see the git log: http://col.la/cool31
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 170b88057..3d42cae8e 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        5%{?dist}
+Release:        6%{?dist}
 %if 0%{?suse_version} == 1110
 Group:          Productivity/Office/Suite
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
commit 5064610358a11436c4322f58faa65236122b6557
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Mar 21 17:19:15 2018 +0530

    loleaflet: don't allow scrollbars to popup
    
    Change-Id: Id018a91dac21ea7b81c57a1628b6e3c61f9c1ec4
    Reviewed-on: https://gerrit.libreoffice.org/52070
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 5ac2a7258..42d3357bd 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -44,6 +44,7 @@
 
 body {
     margin: 0;
+    overflow: hidden;
 }
 
 #presentation-controls-wrapper {