df-libreoffice:distro/collabora/cp-5.0

Last commit made on 2018-10-22
Get this branch:
git clone -b distro/collabora/cp-5.0 https://git.launchpad.net/df-libreoffice
Members of The Document Foundation can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
distro/collabora/cp-5.0
Repository:
lp:df-libreoffice

Recent commits

312ef29... by Andras Timar <email address hidden>

Bump version to 5.0-46

Change-Id: Idc22b8308e71a0a5eb37d009f343f8abae320994

90977da... by =?utf-8?q?Caol=C3=A1n_McNamara?= <email address hidden>

keep pyuno script processing below base uri

Reviewed-on: https://gerrit.libreoffice.org/61969
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <email address hidden>
(cherry picked from commit b1c85cdb37a47998f8ab135fbc96f186334b171c)
(cherry picked from commit a9d81dd30d809b9c5ce2d3e4752039f19be70494)

Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7

c621317... by Aron Budea <email address hidden>

Fix build

Change-Id: Iefff37c32dadf7d22a5495ba9701d4636588d027
(cherry picked from commit 0ce99cc35ea5115571347519b415742c671807ae)

8069ad6... by Andras Timar <email address hidden>

Bump version to 5.0-45

Change-Id: I12d50b95f12ec66810dfa4a5c7b39c92987c2aee

383d9ac... by Mike Kaganski <email address hidden>

Fix build with SDK 7.1A

Change-Id: I2031b8c162d6fdb666d6f6d0daec205b88190370
Reviewed-on: https://gerrit.libreoffice.org/54782
Reviewed-by: Andras Timar <email address hidden>
Tested-by: Andras Timar <email address hidden>
(cherry picked from commit 331e325b8229976312129daa1bc94a584104cb07)

5596c16... by Mike Kaganski <email address hidden>

Fix curl build on MSVC2013

Change-Id: Ie2e85d5c9945d4204f69135bc59e1d668294a83f
Reviewed-on: https://gerrit.libreoffice.org/54770
Reviewed-by: Andras Timar <email address hidden>
Tested-by: Andras Timar <email address hidden>
(cherry picked from commit cce2149365fbf8599de18b277451aca0d0ce5f73)

5eb96b4... by Andras Timar <email address hidden>

curl: upgrade to release 7.60.0

(cherry picked from commit f5a1568cb2e41b68d65e81dda099bc767a7a7801)

Change-Id: Ic8510b424f52c059f979e26441e67ec15b332933

b69b667... by =?utf-8?q?Caol=C3=A1n_McNamara?= <email address hidden>

ofz#7648 Bad-cast

Change-Id: I21aaf36f3d6b6c3054649208de809b99aa384c01
Reviewed-on: https://gerrit.libreoffice.org/52836
Tested-by: Jenkins <email address hidden>
Reviewed-by: Miklos Vajna <email address hidden>
(cherry picked from commit 1db17a71b028c392a00393cdf313e1720b93fd2e)
(cherry picked from commit 20bf87c6a3a076fe78f938b7a3086146336976e7)

9526d27... by =?utf-8?q?Caol=C3=A1n_McNamara?= <email address hidden>

set Referer on link mediadescriptor

to allow determining if the source document is from a trusted/untrusted
location

Reviewed-on: https://gerrit.libreoffice.org/53693
Tested-by: Jenkins <email address hidden>
Reviewed-by: Stephan Bergmann <email address hidden>
(cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926)

Reviewed-on: https://gerrit.libreoffice.org/53803
Reviewed-by: Miklos Vajna <email address hidden>
Reviewed-by: Mike Kaganski <email address hidden>
Tested-by: Mike Kaganski <email address hidden>
(cherry picked from commit 2d87c267267530077a94c894bc619831b01d1c04)

Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
(cherry picked from commit 1bb74bc5410af8773c9ba815fc30252bc99c6791)

9ee5781... by Andras Timar <email address hidden>

Bump version to 5.0-44

Change-Id: I6cd258caa6453394ce72ab62fd7f34535ce51c27