Commit graph

5807 commits

Author SHA1 Message Date
Pranav Kant
2abf2421f3 Warn users if they try to use post message API incorrectly
Change-Id: I09ce1a14587f558765e02fc8197030f4a5d2cee0
2017-06-20 18:56:30 +05:30
Pranav Kant
8ca5efb671 Make this custom button's css consistent with other toolbar images
Change-Id: I39158d634eb5fbe0ce54cb4e5f6be3d01982b074
2017-06-20 18:56:30 +05:30
Andras Timar
e212484668 loleaflet: Updated pot file
Change-Id: I779b18d5f7705c88e00cd81bb3848781c579051b
2017-06-20 10:18:56 +02:00
Andras Timar
f06d3ecc4e loleaflet: Find & Replace dialog l10n
Change-Id: Ia81c557f97fa9a3542462169455c555c87599b43
2017-06-20 10:16:46 +02:00
Miklos Vajna
11f5c6759e test: fix clang -Werror,-Winconsistent-missing-override
Change-Id: Id3d8f979502de3e805d75a94da610543d935909a
2017-06-20 09:34:16 +02:00
Ashod Nakashian
bc067c7b29 wsd: always prespawn children when creating forkit
Also, no need for the DocBrokerMutex to be locked
in createForkit.

Change-Id: I651c50c8b5518f7b0ee0d8b15c413fc070e30443
Reviewed-on: https://gerrit.libreoffice.org/38993
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-20 05:16:54 +02:00
Ashod Nakashian
c28992758d wsd: avoid deadlock when restoring forkit
LOOLWSD::checkAndRestoreForKit() eventually takes
NewChildrenLock, which is also taken in getNewChild_Blocks().

Luckily, we can defer that to the Prisoner poll, which we do.

Change-Id: Ib65c0be08870d1c4c68efd72192dac2e73c79f7c
Reviewed-on: https://gerrit.libreoffice.org/38992
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-20 05:16:23 +02:00
Ashod Nakashian
7ae37aff0d wsd: fix access-after-free error
Valgrind spotted one case, and the other is possible but
not common it seems.

Change-Id: Id5e41145f597c3564263adb25b7b765db1c90bf7
Reviewed-on: https://gerrit.libreoffice.org/38991
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-20 05:15:29 +02:00
Michael Meeks
7f08458d95 Make the slideshow SVG validation somewhat less lame.
Change-Id: Ie4853359ba3b43aabe629d0dcabb635d260627b6
2017-06-19 17:27:10 +01:00
Pranav Kant
c88780b2d4 wsd: Don't show dialog if document is unmodified
Change-Id: Ibb9e2122461c577863d1f713070748bdda6129d1
2017-06-19 20:01:31 +05:30
Pranav Kant
a24475f5dd .gitignore tags files
Change-Id: I004e55ed6b2ba94071824c95a6c4d508f9c56ef8
2017-06-19 20:01:31 +05:30
Miklos Vajna
902411e2ec test: make sure own header is self-contained
By including it before anything else.

Change-Id: I0fa37dcee7828a05e3ba7aac4eec3b63d1203468
2017-06-19 14:55:22 +02:00
Ashod Nakashian
323e2789b9 loleaflet: Allow users to repair at all times
Since during an edit conflict the undo/redo
buttons are dissabled (for the user who can't
undo/redo anymore) disabling the repair button
robs them of the ability to repair the document
to an earlier state (i.e. before the conflict).

This enables the repair button as soon as either
the undo or redo is enabled, whereupon it remains
enabled for the duration of the session.

Change-Id: Ibaf257155f721e2cef596e965d8812d381ab3a5b
Reviewed-on: https://gerrit.libreoffice.org/38942
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-19 07:25:27 +02:00
Henry Castro
c24585741d fix compilation errors with --disable-ssl option
Change-Id: I777f0ebf054db0a5fd2c64e6d56a222826b40045
2017-06-18 14:21:33 -04:00
Michael Meeks
7b90179fe8 Check for spare space in the right place.
ie. destination not source of the local file.

Change-Id: I4d4c4e56deb039a44d8c2ab2886b8ca52bdb2ef8
2017-06-16 20:25:23 +01:00
Michael Meeks
7ea5f71a7b Units: allow filtering of user alerts.
Catch things that kill tests like disk-full earlier.

Change-Id: Ib50b516063305f2fc93b662ec3ad9ab6c52c6c92
2017-06-16 20:25:23 +01:00
Pranav Kant
db13014e00 Update modifiedTime for local files unconditionally
Also teach logger to print timestamp object.

Change-Id: Ia13836814c195cef92f5dafd8245c9958600876d
2017-06-16 19:49:37 +05:30
Aditya Dewan
681138ab54 tdf#106451 admin: graph to monitor network activity
Change-Id: Id71ef4e2a9d16e72f4df442fbf646a39213b61d5
Reviewed-on: https://gerrit.libreoffice.org/38621
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-06-16 09:55:01 +02:00
Miklos Vajna
de785d90b2 test: give the socket the chance to get the error in getErrorCode()
make check fails for me like this:

Test name: HTTPCrashTest::testCrashKit
equality assertion failed
- Expected: 1001
- Actual  : 65535

Failures !!!
Run: 1   Failure total: 1   Failures: 1   Errors: 0

But when I run loolwsd and ./test manually (./test is invoked by gdb) and I
step through the code, then the test passes. So I guess what happens is that we
read from the socket too fast, and the error we're looking for is just not
there yet. Add the same amount of sleep here (0.5s) than what's used in
connectLOKit(), with that the test passes fine.

(The sleep is in test-only code.)

Change-Id: Iff105c45f21c40c2fb0a649fc9fd9a9065e7c952
Reviewed-on: https://gerrit.libreoffice.org/38846
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-16 07:47:20 +02:00
Ashod Nakashian
67a9300514 Revert "loleaflet: Shorten the docuri in the websocket request."
No WOPI doc can be loaded with this patch as the URL is all wrong
and the access_token missing.

This reverts commit ad8b437360cd0b7a95fd587f7b17d4cf1f385ca1.

Change-Id: Icced96564e61eb137c1620a7fb7e66c5ef8e5a5b
Reviewed-on: https://gerrit.libreoffice.org/38810
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 2fc7d50607b14df8ad8055e6d74a9c7970db1ae0)
Reviewed-on: https://gerrit.libreoffice.org/38822
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-15 11:57:15 +02:00
Jan Holesovsky
3a1aa4cd9c loleaflet: Shorten the docuri in the websocket request.
Change-Id: Ia0eed46930930e013a5eeee1c25161a2745f3188
Reviewed-on: https://gerrit.libreoffice.org/38798
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-14 18:29:57 +02:00
Jan Holesovsky
ca1b3e7ec7 discovery: Add bmp as read-only type too.
Change-Id: I42f21bab6f8d4ba24580f6d6e4a3a1dd5cd57811
Reviewed-on: https://gerrit.libreoffice.org/38782
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-14 14:02:32 +02:00
Jan Holesovsky
4f89ce23b2 wsd: Honor the hosting/discovery read-only setting in LocalStorage too.
To make the debugging easier...

Change-Id: I7c6e748e72a595a6c3a5942a20874339b8456f19
Reviewed-on: https://gerrit.libreoffice.org/38781
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-14 14:02:23 +02:00
Aditya Dewan
b833f9c935 tdf#97020 follow up | heading/label not selectable now
Change-Id: I49650ee93269709885419f3accba3d95475aed59
Reviewed-on: https://gerrit.libreoffice.org/38586
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-06-14 07:31:02 +02:00
Pranav Kant
b4ff02cacd loleaflet: Also show scrollbar on hover
Better to add our own class and then add/remove it instead of messing up
with original CSS rules.

Change-Id: I45cf2a566d51fe8e7d9b009c4c9d86b97354ffd1
2017-06-13 18:13:29 +05:30
Pranav Kant
a986238f4e loleaflet: Wrap find & replace inside a function
For better readability in our action if-else tree.

Change-Id: Id0e39ed25362da5feb70002b887b5963a49900b1
2017-06-13 17:22:22 +05:30
Pranav Kant
caa4aa12c7 loleaflet: Add button to menu bar if toolbar doesn't exist
... in case of Insert_Button PostMessage API when the document is loaded
in readonly mode.

Change-Id: I65a316d0b3cf22751a6926bc7aa430a249be5244
2017-06-13 17:22:22 +05:30
Ashod Nakashian
44d8876f27 Remove data rlimit
Seems to have no effect, so gone in
favor of RLIMIT_AS (virtual memeory).

Change-Id: I210879ec9285f420c9f9839cdabf45c42d865fb3
Reviewed-on: https://gerrit.libreoffice.org/38720
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-13 06:27:12 +02:00
Andras Timar
e05fb904f8 updated Slovenian translation
Change-Id: Ibc26776a543068ac492fbf41a6dd32f2e8f8b81f
2017-06-12 21:10:03 +02:00
Pranav Kant
5c7b9ce6e7 Consistency
Change-Id: I16889728d0062c058ea5831ff8892025e1719c3e
2017-06-12 16:09:10 +05:30
Pranav Kant
54ea436026 CSP - Add object-src: , this is required for printing documents
Change-Id: I4a759086f2b503dfa9df4000267d920984cfe422
2017-06-12 15:47:03 +05:30
Pranav Kant
f54a0f6a30 admin-console: Spread the tabbed view to full width
Change-Id: Id34829d0b4c8220690e1ce47baed4b41b6696e7e
2017-06-12 15:47:03 +05:30
Ashod Nakashian
459249b177 wsd: apply rlimits set from Admin Console to ForKit
Change-Id: I425c28ce08c5ecd659c4fe8eaa1a7ed3634e7f18
Reviewed-on: https://gerrit.libreoffice.org/38678
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-12 06:20:13 +02:00
Ashod Nakashian
9e11cd7db7 Support setting rlimits from Admin Console
Change-Id: Ia0d45948998d7a5612a1828a90ad20908d07639e
Reviewed-on: https://gerrit.libreoffice.org/38677
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-12 06:19:53 +02:00
Ashod Nakashian
36fb1e64f0 wsd: new internal command to change config values
Change-Id: I8b4a573ba7b01ee6e7b3b91a00e12cc744f85fa8
Reviewed-on: https://gerrit.libreoffice.org/38676
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-12 06:18:53 +02:00
Ashod Nakashian
6de3adcf9c wsd: pass default rlimits to forkit from config
Change-Id: I84d271f460f0fb1d03a973107c32265d84bf2841
Reviewed-on: https://gerrit.libreoffice.org/38675
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-12 06:18:31 +02:00
Ashod Nakashian
42969b732c wsd: log the relevant rlimits at Kit startup
Change-Id: I6ada56d9bda80301ab55de2c831452b21aa362c1
Reviewed-on: https://gerrit.libreoffice.org/38674
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-12 06:17:58 +02:00
Ashod Nakashian
9cb82cebe3 wsd: add rlimit config entries and defaults
Change-Id: I8cb498d01bc1a7a55d168e49c754bb1bba80aea1
Reviewed-on: https://gerrit.libreoffice.org/38673
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-12 06:17:44 +02:00
Ashod Nakashian
92d29b1ce7 wsd: support setting process rlimits
Change-Id: I7117e6843d2ebc919d7d2303cc593de888cc54b1
Reviewed-on: https://gerrit.libreoffice.org/38672
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-12 06:17:21 +02:00
Jan Holesovsky
637eecb948 loleaflet: Need to distinguish between comments and redlines here.
Change-Id: I3a3111dc6c98bbc0a3ab47e92619f95c0fc65516
Reviewed-on: https://gerrit.libreoffice.org/38566
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-08 13:17:32 +02:00
Aditya Dewan
9502741590 tdf#107278 admin console: adding graph to track CPU load
Change-Id: Idb07fe4139dd639a49ce1545cc15895f74876b06
Reviewed-on: https://gerrit.libreoffice.org/38425
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-06-08 12:58:12 +02:00
Jan Holesovsky
27fdb9b864 loleaflet: Position the Find & replace consistently, and in line with desktop.
Change-Id: I5d9d93339d74f5a9cda304fba876c76cb5391408
Reviewed-on: https://gerrit.libreoffice.org/38519
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-07 17:43:04 +02:00
Henry Castro
075b3b5d1f gitignore: *.lo files
Change-Id: I26fd7381ed30592caefa8f515bbdc3e19defdbab
2017-06-07 10:57:55 -04:00
Jan Holesovsky
ca39f61330 Don't crash on Shift+reload.
Change-Id: I1706fc0ff748fa74f2d2b29f103c167acf36c706
Reviewed-on: https://gerrit.libreoffice.org/38516
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-07 16:35:57 +02:00
Jan Holesovsky
fe6ad56241 The arrows in Next / Prev don't show for me.
Using it this way looks very fragile to me; let's just avoid this.

Change-Id: I7459f3b215f5f9930287566a1bd946a94e9b343b
Reviewed-on: https://gerrit.libreoffice.org/38512
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-07 16:12:44 +02:00
Pranav Kant
05c12733a6 PostMessage API - allow showing/hiding custom progress bar
Change-Id: Ide9c83018938d1195b87153fe78e3924c2d49d4a
2017-06-07 13:28:57 +05:30
Pranav Kant
3867bbe56e Allow adding custom buttons to our toolbar from host; save result resp.
... with no functionality attached to it except notifying the WOPI host
that button was clicked. Host is supposed to do the action thereafter
itself.

Also, notify the host when a save succeeds or fails.

Change-Id: I0daa2690af2259233840ea7ab4326b9b80d5fa87
2017-06-07 13:19:12 +05:30
Pranav Kant
00f4b4c0f2 No need to specify the full path
Moreover, its ideal to use the same URL to get this *-help.html file with
which loleaflet.html is loaded, and not the one with 'dist' in it.

Change-Id: I2e25f9a2ef41bb1d23fc09878b0726d6b4019cee
2017-06-07 10:15:54 +05:30
Pranav Kant
ee026723ed Bin redundant code
Change-Id: Id691052e343cea73f3dec512ee6f4d4960f9614b
2017-06-07 10:15:54 +05:30
Pranav Kant
4711debd9a Some error strings tweaks
Change-Id: I8ce174dfc6d67f467770c1c9804f2bf830fedaf7
2017-06-07 10:15:54 +05:30