libreoffice-online:distro/collabora/collabora-online-cd

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

Branch merges

Branch information

Name:
distro/collabora/collabora-online-cd
Repository:
lp:libreoffice-online

Recent commits

3061dbe... by Andras Timar <email address hidden>

Bump version to 2.1.2-17

Change-Id: I86c44bceebe2d79d3b46a721633ced5f13740c2c

951e86f... by Andras Timar <email address hidden>

Online and KDE/Gnome integrations may conflict

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

752e3b7... by Ashod Nakashian <email address hidden>

wsd: set modified flag on the storage when set on the DocumentBroker

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

78272b9... by Jan Holesovsky <email address hidden>

Avoid an unnecessary buffer in the watermark code.

Change-Id: I29b162fd9d8f43d0a2cb75853f0a3c0dc8ee92df
Reviewed-on: https://gerrit.libreoffice.org/46527
Reviewed-by: Ashod Nakashian <email address hidden>
Tested-by: Ashod Nakashian <email address hidden>
(cherry picked from commit 784e7a16453b7d7f4d86c79a4a8f470cc863dc7a)
Reviewed-on: https://gerrit.libreoffice.org/46548

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

Bump version to 2.1.2-16

Change-Id: I84ed740c643d4eee6cd5e139e1df1ac2c4c13a2b

1866fd8... by Ashod Nakashian <email address hidden>

wsd: improve watermark visibility on dark and grey backgrounds

The watermark text is now rendered on a blurred version
of itself, using inverted colors. This makes it
look sharp on light backgrounds, but inverted in
a blurry haze when on dark backgrounds, thereby
being readable on top of any background.

Change-Id: Ia6daf987674c484980f1fdec4f74e579ed87c213
Reviewed-on: https://gerrit.libreoffice.org/46491
Reviewed-by: Ashod Nakashian <email address hidden>
Tested-by: Ashod Nakashian <email address hidden>

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

Bump version to 2.1.2-15

Change-Id: Iff2834825283508dd68ff677ab66e033400a4537

49b2c7f... by Ashod Nakashian <email address hidden>

Revert "ensure initialize map components before the document is loaded"

This patch broke password-protected documents.

This is because password-protected documents are loaded twice.
The first time the loading fails because of password-protection
and the document is loaded again when the user provides a password
from the UI.

This reverts commit bfdbc68afef8fd21b2293113ddd2b6e766a9a0de.

Change-Id: I1d5567d3a858df76a610e026267f58c77d24fd34
Reviewed-on: https://gerrit.libreoffice.org/45546
Reviewed-by: Ashod Nakashian <email address hidden>
Tested-by: Ashod Nakashian <email address hidden>

8f8662b... by Henry Castro <email address hidden>

loleaflet: fix background color of the top level menu items

Change-Id: I548c700a16664e8acfc6010c1be549e6176f2383
(cherry picked from commit 0d870d444cbbcd1141319f60834bacb80e8d233f)

a409184... by Henry Castro <email address hidden>

loleaflet: show error when the document is disconnected

Change-Id: I43f8d48002ccb2fc3b6ac9807b72ba6b618d72d2
(cherry picked from commit 1a493880a496b805c6c577262715cc09b1e3cab2)