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

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

Branch merges

Branch information

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

Recent commits

7f9cd88... by Andras Timar <email address hidden>

Bump package version to 2.1.6-2

Change-Id: I752bb08ab76fb29721b0229cf4d096dcce8e9b8a

4f1d4ae... by Andras Timar <email address hidden>

enable parallel make with deb package creation

Change-Id: Ia84ca8a33a27cac8f1fcc3668a97ee3857d3c0d8
(cherry picked from commit 5fb16d423dd0fde18b8dee8eb77aa425516a37f9)
Signed-off-by: Andras Timar <email address hidden>

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

loleaflet: Keep the cursor 'default' by default

Change-Id: I88e18f7ce08612837dd99df3f9d08b4561007371
Reviewed-on: https://gerrit.libreoffice.org/50275
Reviewed-by: Aron Budea <email address hidden>
Tested-by: Aron Budea <email address hidden>
(cherry picked from commit fb22b1d97ff14fea4731c37a8e4807b88c7b59ee)
Signed-off-by: Andras Timar <email address hidden>

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

Bump package version to 2.1.6-1

Change-Id: Ic92fe3533545ee3d4b625e371322ea1454763a91

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

new dummy ssl key and cert for testing

Change-Id: Ia2586c4201696e0d80d2be3f284564e65fac71c0
Reviewed-on: https://gerrit.libreoffice.org/52874
Reviewed-by: Andras Timar <email address hidden>
Tested-by: Andras Timar <email address hidden>
(cherry picked from commit 558e20f98142ae85786ec9a5214bf5ef734f25b4)
Signed-off-by: Andras Timar <email address hidden>

566e1ec... by Andras Timar <email address hidden>

tdf#115595 open editable documents with upper case or mixed case file extensions in edit mode

Change-Id: I6ea60926ce0ec4d1323080ffec5152d2bbeefc31
Reviewed-on: https://gerrit.libreoffice.org/49867
Reviewed-by: Andras Timar <email address hidden>
Tested-by: Andras Timar <email address hidden>
(cherry picked from commit 6a914ecbb95e565de51e33e4daeab3c78baeab2b)
Signed-off-by: Andras Timar <email address hidden>

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

wsd: encode '#' character in file name

Change-Id: I4d10f38c9025f18a0d0f0f5599892b436b9d002c
Reviewed-on: https://gerrit.libreoffice.org/49919
Reviewed-by: Andras Timar <email address hidden>
Tested-by: Andras Timar <email address hidden>
(cherry picked from commit dde84d17064926f457b6ef7c6ebd9d595ac837b9)
Signed-off-by: Andras Timar <email address hidden>

0dfdcd9... 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>

29d9c26... by Andras Timar <email address hidden>

fix Poco dependency on SUSE

Change-Id: Ia6a00ff7abcdc56497902aff432c91178d0916d5

a4396b9... by Rene Engelhard <email address hidden>

fix build with poco 1.8.0(.1)

(cherry picked from commit 623b45a533198acc3ef7a393382f23ebb0f6ebab)