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

Last commit made on 2017-06-15
Get this branch:
git clone -b distro/collabora/collabora-online-2-0 https://git.launchpad.net/libreoffice-online

Branch merges

Branch information

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

Recent commits

517e3f8... by Jan Holesovsky <email address hidden>

Let's always descent to loleaflet, and run make there.

It is so easy to forget :-(

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

4702c32... by Andras Timar <email address hidden>

Bump version to 2.0.7

Change-Id: I3324bbf80344f90cb0b737fea3fdc4bb135c2c13

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

wsd: When connecting new sessions, always use the original URI...

...but in combination with the appropriate session's access_token to always
authenticate against the same instance of the WOPI host.

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

502e0fd... by Andras Timar <email address hidden>

typo: loowsd -> loolwsd

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

2f23611... by Andras Timar <email address hidden>

non-world-readable loolwsd.xml in packages

Change-Id: Ibe91699f8d126dd34c1041fcfaaf471974387e47
Reviewed-on: https://gerrit.libreoffice.org/37102
Reviewed-by: Michael Meeks <email address hidden>
Tested-by: Michael Meeks <email address hidden>
(cherry picked from commit f8ae6243dde0c2fdd9bc048020d386de07145bfd)
Reviewed-on: https://gerrit.libreoffice.org/37137
Reviewed-by: Jan Holesovsky <email address hidden>
Tested-by: Jan Holesovsky <email address hidden>

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

Bump version to 2.0.6-2

84d4a1e... by Andras Timar <email address hidden>

new SSL key and cert for testing

Change-Id: I9446bfc7905e5980de6aaa36ca72f206e2c558a2
(cherry picked from commit bb332a9b97a8444ac954770463b9f333fa278e48)

268497d... by Andras Timar <email address hidden>

Bump version to 2.0.6

Change-Id: If523cf16e64a9a9f155acc00e41720048133dbc1

38f032b... by Andras Timar <email address hidden>

Requires: Collabora Office 5.1-24

Change-Id: I5d6cd38c9a189e07620fa5f2cbbd033eca6ff2bc

444358b... by Pranav Kant <email address hidden>

loleaflet: Prevent hscrollbar coming over context menu

Change-Id: Ie4f0fc67aad64e93fe4abc8ac624decc128f59b0
(cherry picked from commit 9107b012e774e9715b18cda656262a06f2f5319c)
Signed-off-by: Andras Timar <email address hidden>