Commit graph

6054 commits

Author SHA1 Message Date
Andras Timar
67ebb9a48e add test/WopiTestServer.hpp to Makefile.am
Change-Id: I9a4b10f0d1f12ed85d31f3dbbc1deb747ff35a2d
2017-09-27 16:37:30 +02:00
Jan Holesovsky
3141cfc99b PutFile ext: X-LOOL-WOPI-IsModifiedByUser unit test.
Change-Id: I0b1ffc74dbbc771f0dcb68f87d46af3ba469ae9e
Reviewed-on: https://gerrit.libreoffice.org/42855
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-09-27 16:37:16 +02:00
Jan Holesovsky
a711d5b60c Separate the fake wopi server to an own class.
Change-Id: Ibb1b06c491be0065aa12a05a43959165d6c86398
Reviewed-on: https://gerrit.libreoffice.org/42853
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-09-27 16:36:21 +02:00
Jan Holesovsky
f658067eaa Don't crash when the parameters are missing.
Change-Id: I96ace7ad7757e7e0c74dd9f361c78ecff6171a96
Reviewed-on: https://gerrit.libreoffice.org/42854
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-09-27 16:36:13 +02:00
Jan Holesovsky
5c604e9f78 PutFile ext: X-LOOL-WOPI-IsModifiedByUser header to indicate modifications.
Change-Id: I5d69903211045969d678df695717eae7452e7f04
Reviewed-on: https://gerrit.libreoffice.org/42852
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-09-27 16:36:02 +02:00
Marco Cecchetti
ee6e64528d wsd: support for FSIZE and NOFILE system limits
The routine for handling the configuration for the max file size
limit, was wrongly using NOFILE. Now we handle both limits correctly.

Change-Id: Ie8b63617286f66af6d4eb1b35b9e4f4b28f3c2a6
Reviewed-on: https://gerrit.libreoffice.org/42803
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/42811
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
2017-09-26 17:40:31 +02:00
Marco Cecchetti
9f99e40d5e Adapt bundled include to core include
Change-Id: I3066a58545f85724fe07bf344d37ca6261312280
2017-09-26 14:30:55 +02:00
Aron Budea
a71c13a718 Adapt to lok API CHANGE in core
Introduced in commit 5bcc79e825d542c40c9ee0f48d1d72ea9aa53c54.

Change-Id: I1f2bf27f45f7e62f96fc5059e02386b1c884b3e6
Reviewed-on: https://gerrit.libreoffice.org/42713
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-25 10:38:04 +02:00
Andras Timar
017f82a84d no error if systemplate dir is existing
Change-Id: I10aba648688ba92150efa41449190a3ba425f03c
Reviewed-on: https://gerrit.libreoffice.org/42663
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2017-09-22 17:10:26 +02:00
Henry Castro
e45d05f847 loleaflet: resolves: no row header in revision history
_onUpdateScrollOffset is triggered when the client window is resized or
when it is loading a new document. However, there are some cases when
the offset is 0, it means to update row and columns.

Change-Id: If4c4bb4f50335c642004ceb7723c8b5eb949cada
2017-09-21 11:31:19 -04:00
Aron Budea
61acc4ae7d loleaflet: enable horizontal scrolling via Shift + mousewheel
Change-Id: I3cac65248628042e0150e9f393c89e4fbefb8ed6
Reviewed-on: https://gerrit.libreoffice.org/41088
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-09-21 15:46:28 +02:00
Jan Holesovsky
b57e38766a Document the 'access_header' WOPI extension.
Change-Id: Ie77501144344fc0503faf100b614e181cf722685
2017-09-20 14:17:33 +02:00
Andras Timar
b8a50e6750 loleaflet: updated UI pot file
Change-Id: I4de681eded5a1839928935be4b3d94dfa90a0efe
2017-09-20 12:12:49 +02:00
Christian Glombek
702bbdd5d8 Add Support for OpenSSL 1.1.0
Change-Id: I0aa58b893e8577bba94fa45c0c4c81449b12e4e2
Reviewed-on: https://gerrit.libreoffice.org/42356
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-09-20 03:48:08 +02:00
Henry Castro
0d870d444c loleaflet: fix background color of the top level menu items
Change-Id: I548c700a16664e8acfc6010c1be549e6176f2383
2017-09-19 21:46:09 -04:00
Michael Meeks
2c1508c309 Implement more reliable in-process short-cuts.
Change-Id: Icdfa71affad147c29df175ae687cbecc3f1f171b
2017-09-19 21:17:13 +01:00
Michael Meeks
def0350379 Re-factor pid hunting code into test.cpp where we can do better.
Prepare the ground for using WSD hooks for this.

Change-Id: I5c3e32396b335ad189472ab3a51044372ee304b2
2017-09-19 21:16:44 +01:00
Michael Meeks
be228a160d Allow unit tests to avoid handleInput.
Change-Id: Ib4accd6bbfdc1fc55c45365df275edfa8a68bc59
2017-09-19 21:13:58 +01:00
Pranav Kant
fcffb01725 Don't forget reconnecting the socket in these cases
This regressed with 7c1e1120c6

Calling .initialize() on socket object is not enough anymore after above
mentioned commit; it doesn't re-establish the socket connection as
was the intent earlier in following cases.

Change-Id: Icd0a87a875eb275ed3c914474cdc502b460e2d16
Reviewed-on: https://gerrit.libreoffice.org/42431
Reviewed-by: Henry Castro <hcastro@collabora.com>
Tested-by: Henry Castro <hcastro@collabora.com>
2017-09-18 20:17:50 +02:00
Pranav Kant
7b4f734b32 Broadcast closing documents in same thread
... instead of handing it over the Document broker polling thread which
can lead to race conditions, and hence not giving desired behavior when
document is changed externally.

Change-Id: Ib0821d4ae931c357bc4d4c526865eefc090ddc23
2017-09-18 23:02:07 +05:30
Miklos Vajna
f375a9d5de Socket: mark setNoDelay() as non-virtual
No derived classes override it, and if they would, that would be a
problem, as setNoDelay() is called from init(), which is called from the
Socket ctor. Calling virtual functions from the base class ctor is not a
good idea, since the object is not fully constructed yet.

Change-Id: I4993e26d09f5d3429c7e2afae7688b84c0061c9d
2017-09-18 10:15:59 +02:00
Henry Castro
1a493880a4 loleaflet: show error when the document is disconnected
Change-Id: I43f8d48002ccb2fc3b6ac9807b72ba6b618d72d2
2017-09-17 11:09:02 -04:00
Henry Castro
0cdf361510 loleaflet: clean up the socket connection
Change-Id: I29861d74ba5e0aa789eec41fb353aca1dad6cce4
2017-09-17 10:45:59 -04:00
Henry Castro
bccdd8d4d7 wsd: notify when the document is disconnected
Change-Id: I36e6df3c576ff0f02d3b059c2f1db4226d527b49
2017-09-17 10:37:48 -04:00
Michael Meeks
5aed7e0814 Unit test script - add help and simplify usage.
Change-Id: I4687f9a39b1abcf5be7e7848c32dfd32c39e7707
2017-09-15 17:58:10 +01:00
Jan Holesovsky
6cd5d869ef Temporary hack to pass through the reverse proxy a nocanon way.
Change-Id: Iefc8704d4b08bab6a0afabcbc9aec5ef11d2be26
2017-09-15 15:32:45 +02:00
Henry Castro
105eeddae1 loleaflet: ignore events before the document is loaded
Change-Id: Icd28854f4430786e1383a7fe6a694f3c7ce9a188
2017-09-14 17:36:45 -04:00
Jan Holesovsky
7707507ed0 Introduce Tools -> Automatic Spell Checking.
Change-Id: Icfae090f69e49bbce2cf98c53c35ab1bb6794490
2017-09-14 11:38:55 +02:00
Michael Meeks
e8d3276f53 Enable spell-checking by default with this setting.
Mainly serves to document how you can turn it off if you so desire.

Change-Id: I6643fd6a8d9b82fa61c507f1b50d80919c119d42
2017-09-14 10:32:19 +01:00
Henry Castro
2556c2b441 wsd: debug: log when the wsd is ready to accept connections
Change-Id: I56ea17af47bc85f30e74f5e93b94e0f3f3d95be4
2017-09-13 17:02:26 -04:00
Henry Castro
9c3393fc44 loleaflet: fix background color of the menu item in disabled state
Change-Id: Idbe08dcd1fd1bb885f77478e3ad314be392a140d
2017-09-13 12:37:10 -04:00
Henry Castro
7c1e1120c6 loleaflet: ensure initialize map components before the document is loaded
Change-Id: I3b6219926f0f9d0306ef25bc5f9a9145410bac74
2017-09-13 11:14:17 -04:00
Miklos Vajna
84e4ea2c3d Kit: pass by const reference and avoid redundant initializer
Change-Id: I550334ec9392121ff9084c35b5c8c6b410917080
2017-09-13 09:13:26 +02:00
Miklos Vajna
bcb5b744b8 net, wsd: fix -Werror,-Wdelete-non-virtual-dtor warnings
Two problem types:

- non-final class has virtual functions but no virtual dtor -> mark the
  class final
- abstract class has no virtual dtor -> add a virtual dtor

Change-Id: Iae208b65c774e6da7a3dda5e725fe07d4d589e4f
2017-09-12 10:03:32 +02:00
Michael Meeks
5c879a17b2 Count key-strokes, and report per session.
Change-Id: Id661fc15d4a75e322024ce62d24b2d7dae8f256a
2017-09-11 19:00:10 +01:00
Jan Holesovsky
c5fc1594e1 HA: Pass WOPISrc= param in all the requests that need to...
...end up in the same loolwsd instance.

Change-Id: I69c4f5be0c0a6f4ffdec6dd571a5d62f2df4b1fb
2017-09-08 17:04:05 +02:00
YiiChang Yen
488c2e98f3 loleaflet: Sortting font-select list localelly
Change-Id: I6ebe7a30e0d47776986aa67b44de7b2bc1d25fca
Reviewed-on: https://gerrit.libreoffice.org/41873
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-08 11:22:17 +02:00
Marco Cecchetti
5112f33d09 Disable slideshow feature when DisableExport property is set.
Change-Id: I424da9abf2bba737c2985c6dcbb2ab9dbee4770c
Reviewed-on: https://gerrit.libreoffice.org/42081
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-07 22:07:46 +02:00
Marco Cecchetti
dee39a562c support for rendering a watermark on each tile
Change-Id: I3edccac49a3bcd3d2493d8d7ef3a1ae29307e727
Reviewed-on: https://gerrit.libreoffice.org/41898
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-07 17:28:44 +02:00
Henry Castro
3b6af443bd loleaflet: related to tdf#107806
Change-Id: Ifd6bd15538007416747accf7b0ad602292b1195a
2017-09-04 20:40:53 -04:00
Henry Castro
01dd761750 loleaflet: log when w2ui toolbar is not created
Change-Id: I9f8f50b628028f9f5541aa97f8c2f0ff2e72924d
2017-09-04 19:26:12 -04:00
Henry Castro
b53bcf23ae loleaflet: disable toolbar buttons before the document is loaded
Change-Id: Ia6679414f8eab54366a48b1c431ce9384d2dc8ca
2017-09-04 16:52:30 -04:00
Henry Castro
a29fa8756d loleaflet: add initial menu bar before the document is loaded
Change-Id: I9ab7f87e0ad3f4c9ff11670b8a2675d895a9c812
2017-09-04 16:35:29 -04:00
Marco Cecchetti
124cf6a7b9 ruler: added the ruler callback enum to the bundled include
Change-Id: Ie8100b08897ce7f49b5108cea147bf9bfe6060ed
2017-09-04 10:06:00 +02:00
Christian Glombek
b61bcd2e53 Fix build from non-git source archives like tar or zip
Change-Id: I359056c9ad2550b625eb3e7b8e71d841eedea93b
Reviewed-on: https://gerrit.libreoffice.org/41553
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-09-03 01:30:27 +02:00
Pranav Kant
67bf4dc212 loolconfig: print help information from option set
Change-Id: Ifbc5ca72d17444b8fdefb7093744cbead1922a31
2017-08-31 09:24:44 +05:30
Pranav Kant
08efd75e31 wsd: fix incorrect password hash format written to config file
Regression from 9a75040bf0

Change-Id: I82cd3db17a18702a046973cfe863fdda750b363b
2017-08-30 17:22:33 +05:30
Jan Holesovsky
f7c199684c WOPI extension: DisableInactiveMessages to avoid showing message when dimmed.
Change-Id: I925602295dde95611ab1a6565dd7266460769a50
Reviewed-on: https://gerrit.libreoffice.org/41709
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-08-29 19:44:33 +02:00
Pranav Kant
29db4b447f admin protocol: 'total_mem' -> 'mem_consumed'
total_mem can be confused with total system memory or total memory
availabe to loolwsd process. Change the API to say what it actually
returns.

Change-Id: I55c246b8a1d0c5c52767520150e55616266a6d4f
2017-08-29 12:12:13 +05:30
Pranav Kant
65e3f7c7df admin: expose total available memory to admin clients
Take into reckoning the memproportion config value for total available
memory to us.

Change-Id: Ib93c88d746268f3e9f566beed7df77357d530eba
2017-08-29 12:12:08 +05:30