libreoffice-online:distro/collabora/collabora-online-3-1

Last commit made on 2018-04-04
Get this branch:
git clone -b distro/collabora/collabora-online-3-1 https://git.launchpad.net/libreoffice-online

Branch merges

Branch information

Name:
distro/collabora/collabora-online-3-1
Repository:
lp:libreoffice-online

Recent commits

71ddd59... by Andras Timar <email address hidden>

Bump package version to 3.1.0-8

Change-Id: I8f682a5ddbb42807856614a1dd8846b27c86ddb0

7eb2cf9... by Jan Holesovsky <email address hidden>

Sanity-check the scheme and host for frame ancestor, POCO does not do that.

Change-Id: Ieea9532ccd2a11e74f370a340e68f46122469848
(cherry picked from commit c8ef63253a94a4f74cc4238d7d070f75e26bec3e)
Signed-off-by: Andras Timar <email address hidden>
(cherry picked from commit 4527163351325befbe8032edf0829edbedbb982d)
Signed-off-by: Andras Timar <email address hidden>

8b9ef21... by Andras Timar <email address hidden>

Bump package version to 3.1.0-7

Change-Id: I2d90cb1947dfdc7ec0bdb29245ca4092bcb1bde7

85af6c3... by Pranav Kant <email address hidden>

Revert all related loleaflet IME changes

... that can potentially affect the html/css layout. We have a problem
in the front-end where map gets incorrectly positioned due to the moving
candidate window. With this revert, the candidate window is thrown back
at where it was (to the top-left) and the problem we are facing (as
mentioned above) dissappears as well. Let's fix that problem first
before re-revert it.

This reverts commit 98b53ae956782ce7366a2d4b29e80ce31b748058.

Change-Id: I2882900246efc068e514de134dc3fdd07f1ef024

fb27bcc... by Andras Timar <email address hidden>

Bump package version to 3.1.0-6

Change-Id: Ia2355beeb2aecb8b46dd40516179323843b1341c

5064610... by Pranav Kant <email address hidden>

loleaflet: don't allow scrollbars to popup

Change-Id: Id018a91dac21ea7b81c57a1628b6e3c61f9c1ec4
Reviewed-on: https://gerrit.libreoffice.org/52070
Reviewed-by: Jan Holesovsky <email address hidden>
Tested-by: Jan Holesovsky <email address hidden>

779909d... by Pranav Kant <email address hidden>

Only create clipboard for one cursor

Change-Id: Ief33fd516d2e1aecc561f32098fdd07a8cd98a20
Reviewed-on: https://gerrit.libreoffice.org/52026
Reviewed-by: Jan Holesovsky <email address hidden>
Tested-by: Jan Holesovsky <email address hidden>
(cherry picked from commit 98b53ae956782ce7366a2d4b29e80ce31b748058)
Reviewed-on: https://gerrit.libreoffice.org/52065

7389895... by Pranav Kant <email address hidden>

Fix for incorrect map positioning

Apparently, blurring and focussing the text area again causes incorrect
map positioning.

2 page document
click into last line of second page
scroll to first line of first page and click there
see the incorrect map positioning

Change-Id: Ib26fb67d17b16efebbbe18a2c022b18d592a4868
Reviewed-on: https://gerrit.libreoffice.org/52056
Reviewed-by: Jan Holesovsky <email address hidden>
Tested-by: Jan Holesovsky <email address hidden>

ddae71a... by Jan Holesovsky <email address hidden>

Move the clipboard-container directly into the cursor.

Fixes a nasty additional browser's scrollbar that sometimes appearead on
PgDown.

Change-Id: I1b629de51fb5f82dceb007105eb4c3ee1d411d22
Reviewed-on: https://gerrit.libreoffice.org/52055
Reviewed-by: Andras Timar <email address hidden>
Tested-by: Andras Timar <email address hidden>

3dd226e... by Andras Timar <email address hidden>

BUmp package version to 3.1.0-5

Change-Id: I6d5753cc12c5c17e62c21e3cdefcf315fd2f5ec3