Commit graph

1629 commits

Author SHA1 Message Date
Tor Lillqvist
46e2446db1 Update from LO master 2016-02-17 15:28:00 +02:00
Tor Lillqvist
446035ca69 Make the loTemplate path work inside the chroot, in the preinit case
Create a corresponding symlink inside the chroot.

Now a LOK_PREINIT=1 loolwsd starts up for me successfully. (Note: I
did not say whether it actually works. I don't know yet.)
2016-02-17 15:26:43 +02:00
Pranav Kant
da729a2b74 loolwsd: Add missing callbacks
We have a new callback now in LO core.

Change-Id: I560e5e31d08cf2b9969b8c5f9614630c29ee89c6
2016-02-17 16:24:13 +05:30
Tor Lillqvist
268c48c473 Minor edit 2016-02-17 12:43:03 +02:00
Tor Lillqvist
86f1e5087c Say that running 'make check' is mandatory
(Too bad that it is broken after
9e3d5c0337f9cd1439d4b6b648eb6ac795ff792e.)
2016-02-17 12:35:15 +02:00
Andras Timar
d43cea2883 loleaflet: fix Khmer translation 2016-02-17 11:24:14 +01:00
Andras Timar
a178d445cd loolwsd: setcap loolkit 2016-02-17 10:42:00 +01:00
Andras Timar
6c761c297e loleaflet: use absolute URL 2016-02-17 10:38:43 +01:00
Andras Timar
4308d2a745 loleaflet: indentation 2016-02-17 09:41:49 +01:00
Pranav Kant
f6baed14c0 loleaflet: Handle outline levels as special case, for l10n
'Outline' is localized, 'Outline x', where x = number, is not.
Lets treat outline levels as special case so that we could get
their localized form also.

Change-Id: I96d1a0d715e5859f9d0f2da2c00c06232621555b
Reviewed-on: https://gerrit.libreoffice.org/22354
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2016-02-17 08:33:25 +00:00
Pranav Kant
4947b8feb6 loleaflet: Change to browser language codes
The .po files imported from LO has some codes that browsers don't
recognize. Change them so that browsers recognize them.

Change-Id: Icf37812a579be171af33a62096b2326d6a66e3a4
Reviewed-on: https://gerrit.libreoffice.org/22370
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2016-02-17 08:32:57 +00:00
Pranav Kant
816a43efb6 loleaflet: Added style translations
Translation of styles for writer, impress and calc
in all languages taken from LibreOffice translation submodule.

Change-Id: Id533463f63523cade53435d66ff85a90fc15736b
Reviewed-on: https://gerrit.libreoffice.org/22353
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2016-02-17 08:32:14 +00:00
Henry Castro
a607159a8a loolwsd: catch exception requestTermination 2016-02-16 17:25:51 -04:00
Henry Castro
9b4099c41c loolwsd: check if the named pipes exists 2016-02-16 17:13:14 -04:00
Henry Castro
3ad641c7bd loolwsd: check if the pipe path exists 2016-02-16 17:04:21 -04:00
Andras Timar
b9856a7806 loleaflet: enable scrollHandler 2016-02-16 17:31:17 +01:00
Tor Lillqvist
33ecd5ea2d Introduce environment variable SLEEPKITFORDEBUGGER
Sleeps a "kit" process after fork() for the specified number of
seconds to give you time to attach it in the debugger.

Also, if set, have the parent ("broker") process wait indefinitely the
fifo to become writable.

Also clarify the informative message for SLEEPFORDEBUGGER.
2016-02-16 10:49:42 +02:00
Ashod Nakashian
90776a3c0d loolwsd: control preinit vs fork using envars and disable bind-now
Change-Id: I63dffa18da69751ab72463bb64065d235d811db5
Reviewed-on: https://gerrit.libreoffice.org/22381
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-02-15 23:18:24 +00:00
Tor Lillqvist
b276c3541c Probably we should pass loTemplate to globalPreinit(), not loSubPath
globalPreinit() does not run in a chroot as far as I see, so trying to
use loSubPath as an absolute path will not work. Probably what was
meant is loTemplate, then the libraries at least are found.
2016-02-15 22:59:03 +02:00
Tor Lillqvist
c62d612562 Clean up error reporing
If neither libsofficeapp.so or libmerged.so exist where we look for
them, say so explicitly.

Log the error message from dlerror(), too.

Log the mesage about not forking in all cases when doing that, not
just if lok_preinit is not found.

Execing is not an alternative to fork(), spawning is.
2016-02-15 22:33:56 +02:00
Andras Timar
71e283ca9d loleaflet: fix a typo in reference.html 2016-02-15 19:04:23 +01:00
Andras Timar
5cdbe3e837 loleaflet: fix unclosed tags in reference.html 2016-02-15 18:58:06 +01:00
Andras Timar
dbed8b8497 loleaflet: l10n related file renaming 2016-02-15 10:41:28 +01:00
Andras Timar
30cfc3678f loleaflet: enable l10n of insert/delete slide feature 2016-02-15 10:27:33 +01:00
Andras Timar
63cc475ffc loleaflet: enable l10n of socket error messages 2016-02-15 10:06:10 +01:00
Andras Timar
691b40fedc loleaflet: enable l10n of add/remove/rename sheet tab feature 2016-02-15 09:26:01 +01:00
Pranav Kant
78dfb5f3eb loleaflet: Allow adding/removing/renaming spreadsheets
This uses context menus using a jquery plugin:
Project: https://github.com/swisnl/jQuery-contextMenu
License: MIT

Change-Id: Ibab544555ace25e4f7816392eb048349f0c4c1e1
Reviewed-on: https://gerrit.libreoffice.org/22279
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2016-02-15 08:07:51 +00:00
Andras Timar
4d59d91293 typo 2016-02-15 09:06:47 +01:00
Henry Castro
45754cc36c loolwsd: remove unused TerminationState 2016-02-14 23:08:59 -04:00
Pranav Kant
93fdcb34c4 loolwsd: Do not unload without a successfull load
A load document operation may fail, for example, when user enters
a wrong password or no password. In such cases ToPrisoner sends a
disconnect to child. Child do not need to take any steps in this
case, such as, decrementing the view counter, because nothing was
loaded.

Change-Id: Ib71f871aa1728c6355563362987800dece1679d3
Reviewed-on: https://gerrit.libreoffice.org/22203
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-02-15 00:31:29 +00:00
Henry Castro
cdcb32f013 loolwsd: loolbroker drop capabilities 2016-02-14 14:54:04 -04:00
Henry Castro
f5c163e6da loolwsd: avoid deadlock with mutex and join 2016-02-14 14:39:02 -04:00
Henry Castro
42abb3b1a7 loolwsd: websocket shutdown receive 2016-02-14 14:32:55 -04:00
Henry Castro
72db8ed63a loolwsd: replace the random jail id for lokit process id 2016-02-13 19:01:03 -04:00
Henry Castro
75b552bf71 loolwsd: create named pipes workspace 2016-02-13 13:22:15 -04:00
Henry Castro
9e3d5c0337 loolwsd: ensure chroot jail every lokit process 2016-02-13 10:15:28 -04:00
Tor Lillqvist
8a571401c0 Use less misleadit variable name 2016-02-12 14:09:29 +02:00
Tor Lillqvist
9a15bc6c2c Zero is a valid return value from open()
Sure, it is highly likely that fd 0 is already in other use, but let's
be correct.
2016-02-12 14:01:10 +02:00
Tor Lillqvist
d19433c3b8 Bin unused macros 2016-02-12 13:31:32 +02:00
Tor Lillqvist
ce3dc628be Fix misleading comment 2016-02-12 13:26:19 +02:00
Tor Lillqvist
39bfd5a210 Look for self-copmpiled Poco also in /opt/poco
That's where I have it...

Also, make sure such self-built Poco libraries themselves get copied
into the systemplate.
2016-02-12 13:23:41 +02:00
Andras Timar
97dcfdc7e8 loolwsd: bump version after tarball 2016-02-11 22:33:44 +01:00
Andras Timar
76b72c8008 loolwsd: bump version before tarball 2016-02-11 21:55:36 +01:00
Andras Timar
77fbb5d32d loleaflet: bump version after tarball 2016-02-11 21:55:08 +01:00
Andras Timar
6ac228401d loleaflet: bump version before tarball 2016-02-11 21:52:35 +01:00
Jan Holesovsky
f73c0980e2 loleaflet: Allow wss: protocol as a base for the image upload URL too. 2016-02-11 20:26:06 +01:00
Jan Holesovsky
9f96b1716f loleaflet: Init the handlers necessary for initializationcomplete first. 2016-02-11 11:20:45 +01:00
Pranav Kant
6a7a014d14 loolwsd: Remove cached 'status' command output on 'setclientpart'
Otherwise we have a problem when cached information is different than
the actual one maintained by LOKitDocument, keeping the whole
server setup in an inconsistent state.

For example, when client reloads the browser session quickly
after setting the current part (to say 3) of an opened part document.
If the reload occurs soon enough before the 'setclientpart'
message originated from the client is acknowledged by the server,
then the next reload would get the cached 'status' entry asking
the client to set 'currentpart' to something else leading to the
generation of another 'setclientpart' message. This thing would
go on, and we would run into a loop, as I have for the last few
hours.

Change-Id: Ia6260dfb772f2e3f023572aa060fd7da92b196c8
Reviewed-on: https://gerrit.libreoffice.org/22272
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-02-11 05:04:22 +00:00
Pranav Kant
b482dfba56 loleaflet: Fix wrong initializationcomplete signal
This should ideally be fired when we receive 'commandvalues'
command, not 'statechanged'.

Change-Id: I34748979a7606cd50e6965850757eda891a9aa15
2016-02-10 15:01:00 +01:00
Jan Holesovsky
f41b9c7703 loleaflet: Send 'saveas' with the 'TakeOwnership' option.
So that the .uno:ModifiedStatus works.
2016-02-10 15:00:50 +01:00