Commit graph

6186 commits

Author SHA1 Message Date
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
Aditya Dewan
c61db390c9 Ruler now compatible with comments and zoom
Change-Id: Ic5e99eb3a280ce5f5f4621b20d0e44250ea30621
Reviewed-on: https://gerrit.libreoffice.org/41562
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-28 10:46:26 +02:00
Aditya Dewan
6494821d27 add numbers on ruler
Change-Id: Iff90ddedf3c808cda3bad0a397b456cb8c9e607d
Reviewed-on: https://gerrit.libreoffice.org/41336
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-28 10:46:17 +02:00
Aditya Dewan
94ee746edc Add tooltip on ruler to track change
Change-Id: I6d982dadbee18e2ce492b80f429b65e20b3905f8
Reviewed-on: https://gerrit.libreoffice.org/41352
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-28 10:45:55 +02:00
Aditya Dewan
8ef4d33e15 Adding ruler to loleaflet
Change-Id: I585850a7111eb5ab70bc5b51a508eb29317b92ca
Reviewed-on: https://gerrit.libreoffice.org/40461
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-28 10:45:33 +02:00
Pranav Kant
29aef0af4b loleaflet: Mention the reason of closing websocket to WOPI hosts
Reason is part of the JSON of post message with ID, 'Session_Close'.

Change-Id: I51a465f63fbd80843292a3f19c5b89f920301194
2017-08-25 18:46:39 +05:30
Pranav Kant
ad211ef51b wsd: Configurable autosave and idlesave durations
But these save conditions are checked every 30 seconds only, so setting
them to less than 30 seconds wouldn't mean that save will be triggered
anytime sooner.

Change-Id: Id473a79af6a3170c72e372040460f2b7c15f150e
2017-08-24 16:54:15 +05:30
Pranav Kant
da4fe86b82 wsd: Do not throw when cannot save local file out of jail
Change-Id: Ie155823536694facb8bfcfe49f6386a7fc845689
2017-08-22 19:50:19 +05:30
Pranav Kant
a9522f38aa wsd: Notify forkit conditionally about rlimits
No need to notify the forkit very early when loolwsd is initializing and
forkit pipes are not set. Forkit is notified of rlimits anyway
explicitly in the URL when it is initialized; no need to try to
initialize it again.

Change-Id: I9fde13e42f6e6393da7cf245ed979538d715319a
2017-08-21 20:06:11 +05:30
Pranav Kant
b0ad8874dc wsd: don't write until forkit write pipe is ready
Change-Id: I95439e8e77dc308d993b07ccbd273228f755ce14
2017-08-21 20:06:06 +05:30
Aditya Dewan
4f775788b2 tdf#107278 bug fix | misinterpratation of units related to network usage
Change-Id: I22bccfe1970b11a0284d0e7ecee9e71f4b0522f7
Reviewed-on: https://gerrit.libreoffice.org/41327
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-21 12:18:30 +02:00
Aditya Dewan
0cf9c8791f tdf#107278 Beautification of graphs
- better looking axis
- smooth transition for axis and data path

Change-Id: I419a1e9a0691fc4b6a396a970a438431aa724d9c
Reviewed-on: https://gerrit.libreoffice.org/41313
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-21 12:07:37 +02:00
Jan Holesovsky
057fd10881 No need to scare people too much.
Change-Id: I2b598b3363a73c352bda2cb6bbf0c0d208456456
Reviewed-on: https://gerrit.libreoffice.org/41291
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-08-18 15:39:16 +02:00
Pranav Kant
769e41dfb2 Fix build
Mismerge. There is no session->getAccessToken now

Change-Id: I4d8f2cc612cbd39b3163bcdbba5df8ea5d732774
2017-08-18 07:14:33 +05:30
Aditya Dewan
c3711a4375 Extending WOPI implementaion to introduce 'Save As' feature
Change-Id: Ic4c80f4c4b54944143682c25a5878c1336787b27
Reviewed-on: https://gerrit.libreoffice.org/40946
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-08-17 19:25:44 +02:00
Pranav Kant
10bfd18e97 Decode the headers before creating Authorization object
Change-Id: I0da0b4112ac46d2407d2cd308b21ee1dee9d68de
Reviewed-on: https://gerrit.libreoffice.org/41258
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-08-17 17:15:12 +02:00
Jan Holesovsky
a3a3d0ad6c Fix various nitpicks.
Change-Id: I41fe795bc1ea7c73527c7e1183de7098517bad7a
2017-08-17 14:05:22 +02:00
Jan Holesovsky
d78c0b164b unit tests: Really bail out on error; and no need for a tempfile.
Change-Id: I53c1ab62bf9293217a5cada54c358292364ed60a
2017-08-17 14:04:22 +02:00
Jan Holesovsky
f8ca17278f access_header: Pass the access_header around + unit test.
Change-Id: I5d6d93e289d8faceda59deae128e8124a0193d95
Reviewed-on: https://gerrit.libreoffice.org/41243
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-08-17 13:41:07 +02:00