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

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

81ad63b... by Andras Timar <email address hidden> on 2016-11-28

Bump version to 1.9.10

4f5bc1e... by Jan Holesovsky <email address hidden> on 2016-11-28

These constants are not needed any more.

Change-Id: I5e73d4eacdf5e88f11bc3755162fe601a65417fe
(cherry picked from commit e15ec1d33b6da6cbf5b66f1ebcfc63fd4c167d80)

3d7da86... by Jan Holesovsky <email address hidden> on 2016-11-28

Make sure we don't use the jitter / delay in production builds.

And default to 0 even for debug; who wants to use that for debugging, they
know what to do.

Change-Id: I23dd0c5f806b2b31a883b7a2b8d822ea8c0bb6c5
(cherry picked from commit 9842f3239ff08583d74c9a835937a6ea781e570c)

c7f4158... by Pranav Kant <email address hidden> on 2016-11-24

loolwsd: Handle zero jitter

While some value of jitter is default in debug builds, one should
easily be able to disable this latency stuff using env. variables
LOOL_WS_DELAY=0 LOOL_WS_JITTER=0

Change-Id: I345df8f48adc69b5f237f18c981172441d21c757
(cherry picked from commit 33393a4254e605a46b9f866306a84935fdf0619e)

eb31030... by Andras Timar <email address hidden> on 2016-11-23

loolwsd: add LibreOfficeKit.hxx to tarball

4b04119... by Pranav Kant <email address hidden> on 2016-11-23

loolwsd: unused param

Change-Id: If74ccb603337971076e93c03ac28a9d8b5115f61
(cherry picked from commit 96952ceafd4de83093b4aed78320f673d599fda8)

f56ee6b... by Pranav Kant <email address hidden> on 2016-11-23

loolwsd: -Werror=shadow

Change-Id: If346299e76e50eabde65a4c3aab7b529a8c09148
(cherry picked from commit 81e4b052beda012219a5990dfed222f518b899a3)

d539332... by Ashod Nakashian <email address hidden> on 2016-11-23

loolwsd: avoid deadlocking when alerting all users

Alerting all users is done from different contexts.
One such is when loading a new document.

Since both alerting all users and loading documents
need to hold the same lock, this would deadlock.

The solution here is to differentiate between
external alerts and internal ones (to WSD).

The internal one expects to be invoked while holding
the lock, while the external one always takes the lock.

Care should be taking when alerting from within WSD to
avoid this deadlock.

Change-Id: Idf0e952db1216a3d161f22c7da51af16701f685b
Reviewed-on: https://gerrit.libreoffice.org/31102
Reviewed-by: Ashod Nakashian <email address hidden>
Tested-by: Ashod Nakashian <email address hidden>
(cherry picked from commit 51c88c5fb79c5db146a08f5ef2d9a4fe6d095caa)

a3f6ad1... by Ashod Nakashian <email address hidden> on 2016-11-23

loolwsd: minor cleanups

Change-Id: I9f75b991e6f4bedcffe1dd86f2a5cff2a606bf89
Reviewed-on: https://gerrit.libreoffice.org/31101
Reviewed-by: Ashod Nakashian <email address hidden>
Tested-by: Ashod Nakashian <email address hidden>
(cherry picked from commit 5d4aa362404eff5c5ed12ffcce2cefa8e5be409d)

b8e7bcb... by Andras Timar <email address hidden> on 2016-11-22

loleaflet: updated pot file

(cherry picked from commit a01ec99e90a1b15ad495cc0f5cf809015283f558)