strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5359 commits 1 branch 0 tags 244 MiB
Commit graph

5359 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Meeks
e79c5f9083 Use process name for a thread if no name is set (yet). 2017-03-31 11:21:35 +01:00
Pranav Kant
453a452ff9 Makefile: Simplify and link zlib properly 
Without this, online doesn't link, atleast for me. The problem seems to
be because in presence of target specific _LDFLAGS, AM_LDFLAGS is
ignored and it is only the latter where we are specifying ZLIB_LIBS.

Further, since the LDFLAGS values are same for all targets, we can
simplify here and rather use AM_LDFLAGS and remove all target specific
LDFLAGS.

Change-Id: I2f1c30c7f34b32c638a4ac60fab709b32f1e6c9a
Reviewed-on: https://gerrit.libreoffice.org/35959
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
 2017-03-31 09:17:56 +00:00
Pranav Kant
4b7904036a loleaflet: Annotate readonly users in userlist 
Change-Id: Ia000a06baf9f88830dd30c4c4a4297eb10192fd6
 2017-03-31 12:22:39 +05:30
Pranav Kant
bc98231119 loleaflet: Store and hide readonly view cursors 
Change-Id: Ib2bec3158275e77d883308e25f1984491309234f
 2017-03-31 12:20:43 +05:30
Pranav Kant
ce1084b74f wsd: Send readonly info to clients 
With this every other client would be able to know about other client's
permission i.e whether they have opened the document as readonly. This
could be important eg: to hide the cursor overlay of readonly users in
the UI or to mark these users as readonly in the userlist.

Change-Id: I5dcb1b4e5a22c9b546d16b69b9216cc7653cff04
 2017-03-31 12:20:09 +05:30
Andras Timar
ec5fb2a794 add missing default config values 
Change-Id: Ic7829c8f97f43bf8f4f2ba4eccdbdf1da89665e4
 2017-03-31 07:51:43 +02:00
Pranav Kant
30c9414d6d loleaflet: Context menu cut/copy/paste is always internal 
If user wants to take something out of the document, he/she needs to
make use of keyboard shortcuts to do the same.

Change-Id: Id8237e0bfcb311d1a1465645042f160f7e1d8fb6
 2017-03-31 11:07:27 +05:30
Michael Meeks
f20e931b29 Re-enable UnitPrefork. 2017-03-30 21:59:05 +01:00
Michael Meeks
a2398fc367 Improve debugging information. 2017-03-30 21:59:05 +01:00
Michael Meeks
eab89a0e70 Fix unit test delay time check. 2017-03-30 21:59:05 +01:00
Henry Castro
1cc621f2af test: remove duplicate common/Util.cpp 
Change-Id: I65cfd6a0460a09f7ed3708082127a2ff939e7622
 2017-03-30 15:37:21 -04:00
Michael Meeks
ae0dba1088 Cleanup prctl / gettid system-call thrash on logging. 
Makes the strace look much prettier.
 2017-03-30 18:14:40 +01:00
Michael Meeks
913c469aa8 Cleanup whitespace, return is not a function. 2017-03-30 17:34:52 +01:00
Pranav Kant
1507560e11 tdf#106842: Document DisableCopy mode 
Change-Id: I4c9efc5a9a32b4eea8cc751fce418c85d9fa4f35
 2017-03-30 18:49:02 +05:30
Pranav Kant
87c9b30f48 tdf#106842: Prefix 'Internal ' to cut/copy/paste strings 
... in DisableCopy mode.

Change-Id: Id758d4654fbe129dd16a466050bf51686440909d
 2017-03-30 18:11:49 +05:30
Pranav Kant
017fe90af1 loleaflet: Refine copy/pasting in DisableCopy mode 
We always want internal document copy/paste to work and always want to
do a richtext copy/paste whenever possible.

Change-Id: I54705293bd34bc284ceff815ebdf556c7ca1587c
 2017-03-30 18:11:49 +05:30
Michael Meeks
a4ac00d854 Add zlib cflags and libs to configuration. 2017-03-30 12:09:12 +01:00
dewana-dewan
4322045667 tdf#106579 - serving gzipped file content 
Change-Id: I320b22babf1bf65a0f1d4b1809a6ffb1f5ec8344
 2017-03-30 12:09:12 +01:00
Jan Holesovsky
1d335b92ce Avoid extensive warning about a normal situation. 
Change-Id: Ie67a12847afddac087f74e4872744b2b8bb07b1e
 2017-03-30 11:21:10 +02:00
Ashod Nakashian
7d3f5c0d2b wsd: terminate DocBrokers asynchronously 
Remove locks and replace with isCorrectThread
assertions instead.

Crash recovery still needs some work, but
otherwise tests are clean (91/94 pass).

Change-Id: I9ac3e21854447d19a8e6106487dfd8be00fcf5ef
 2017-03-30 02:19:24 -04:00
Ashod Nakashian
00f8232652 wsd: simplify getNewChild 
Change-Id: Id939025fabdcd81ee3ab5ba3ae6c4ed446944a2a
 2017-03-30 02:19:24 -04:00
Ashod Nakashian
2fa34440c5 wsd: handlePostRequest no longer blocks 
Change-Id: Id5054ce3b8d5937154493959b1e71e1a0c7387bc
 2017-03-29 23:55:19 -04:00
Ashod Nakashian
492b818022 wsd: warn if isCorrectThread will fail 
Change-Id: I362b23e651c00a6514bd1e44fa0961269252bcdd
 2017-03-29 23:55:19 -04:00
Ashod Nakashian
48ad9a2472 wsd: ClientSession::isLoaded -> isAttached 
Since this doesn't necessary mean the document
was loaded completely (as the similarly named
flag in DocumentBroker signifies) rather that
the session was added to DocumentBroker.

Change-Id: Ibfc702bbd111ade2715dcb28ac3aa4e9e8e025dd
 2017-03-29 23:55:19 -04:00
Ashod Nakashian
30d58f96a4 wsd: avoid unnecessary temp string construction 
...when sending text messages over socket and
make return value indicative of success/failure.

Change-Id: Ie4d99103b0d49d238152f7da3155ebcb6ccd4e22
 2017-03-29 23:55:19 -04:00
Ashod Nakashian
d77ede8954 wsd: consistent naming sendFrame -> sendMessage 
Change-Id: I06c6bb42392a8982a8bb232eee33ece4c8dfc451
 2017-03-29 20:03:01 -04:00
Henry Castro
ebf6bb389e loleaflet: simplify date format of the annotation object 
Change-Id: I4d7adfa93f03b8fd639fd701066ed83b41a1bd82
 2017-03-29 15:26:05 -04:00
Henry Castro
dc7cbaef0e loleaflet: re-work the arrangement of annotation objects 
Change-Id: Idce433835bed16b943306e6ad1bb888f5e9e1ee5
 2017-03-29 14:55:36 -04:00
Pranav Kant
9107b012e7 loleaflet: Prevent hscrollbar coming over context menu 
Change-Id: Ie4f0fc67aad64e93fe4abc8ac624decc128f59b0
 2017-03-28 18:47:18 +05:30
Andras Timar
2a64ae7bc0 use SSL certs from build dir in unit tests 
Change-Id: If0bf245d8acb6873802c9054cb8bb30aa1005ad4
 2017-03-28 08:51:14 +02:00
Ashod Nakashian
fbf3b87626 wsd: simplify and cleanup session creation 
Change-Id: I8cc05bc7a8dc89c6a521b81c6d59ff1e9968763a
Reviewed-on: https://gerrit.libreoffice.org/35789
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-28 05:15:28 +00:00
Ashod Nakashian
99844c1c92 wsd: protect DocBrokers session member 
It is accessed from the PrisonerPoll
when cleaning up.

Change-Id: Ieb57cdd63cc08632bcdaa4fc5ccd4a1a53c06fe7
Reviewed-on: https://gerrit.libreoffice.org/35788
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-28 05:14:41 +00:00
Ashod Nakashian
1a6f6e9a65 wsd: trigger child and doc housekeeping upon terminating kit 
Change-Id: I7ffbadb40221c19b24fd172d1b9aabcaa8c581e5
Reviewed-on: https://gerrit.libreoffice.org/35787
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-28 05:14:22 +00:00
Ashod Nakashian
0624904500 wsd: flush sockets using timed loops 
Change-Id: If6cc6194aa36a770913b777a8f19617fea6ba4a7
Reviewed-on: https://gerrit.libreoffice.org/35786
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-28 05:12:36 +00:00
Michael Meeks
e26079eecb tdf#106797 - avoid locking up / crashing on exceptions from main. 2017-03-27 20:15:30 +01:00
Samuel Mehrbrodt
fd5df2f1da Revert "Don't try to copy the file when it already exists" 
This reverts commit 0b91533abb.

Change-Id: Ic672cca1ba26cd926923632d27ea8bb9a64495b5
Reviewed-on: https://gerrit.libreoffice.org/35758
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
 2017-03-27 13:06:09 +00:00
Samuel Mehrbrodt
0b129c05a9 Find libpng on Ubuntu also 
Change-Id: Ib0ed1b26ddac1aca6381650c85e17a4b1a6d017f
Reviewed-on: https://gerrit.libreoffice.org/35749
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
 2017-03-27 10:03:07 +00:00
Samuel Mehrbrodt
0b91533abb Don't try to copy the file when it already exists 
Without this, 'make run' fails for me

Change-Id: I7fd3c39a0443d9f5d70af2382e498cd5c10435d8
Reviewed-on: https://gerrit.libreoffice.org/35649
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
 2017-03-27 08:41:14 +00:00
Miklos Vajna
c1e8fc5334 wsd: fix libstdc++-4.8 build 
error: no viable conversion from returned value of type 'bool' to
function return type 'std::shared_ptr<DocumentBroker>'

Change-Id: I5d4215ce61e5327ab702dbf6e4cc7be1330afed2
 2017-03-27 09:18:36 +02:00
Samuel Mehrbrodt
460da71ce2 Use hub link for git log 
Change-Id: Iaf4a6f5568f2e84d8261756607a62598a7144df1
Reviewed-on: https://gerrit.libreoffice.org/35656
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
 2017-03-27 07:15:10 +00:00
Ashod Nakashian
6d7f39356c wsd: flush sockets before exiting DocBroker poll thread 
Change-Id: Id5384c113bd761b5b8c25286f1bd5a28051c63d3
Reviewed-on: https://gerrit.libreoffice.org/35740
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-27 03:21:38 +00:00
Ashod Nakashian
fddb86744e wsd: stop DocBroker poll thread when poll is flagged to stop 
Change-Id: I1bfc3a4e0a0cc7753d330a009bb295c0fce9efca
Reviewed-on: https://gerrit.libreoffice.org/35739
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-27 03:21:04 +00:00
Ashod Nakashian
f2f0040275 wsd: use isCorrectThread 
Change-Id: Id63c30b19489d590b995e0ea66ef2f44e8cddfb7
Reviewed-on: https://gerrit.libreoffice.org/35738
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-27 03:20:43 +00:00
Ashod Nakashian
5ae94cc7ec wsd: onConnect takes shared_ptr and better logging 
Change-Id: I175dfa1f28444b9bb1f612242ee44b6d0507272c
Reviewed-on: https://gerrit.libreoffice.org/35737
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-27 03:20:22 +00:00
Ashod Nakashian
2a049cf60f wsd: kill unused code 
Change-Id: I09fb52f0455e45e7217b290d5355019e14b9dbc1
Reviewed-on: https://gerrit.libreoffice.org/35736
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-27 03:19:35 +00:00
Ashod Nakashian
f1c371555a wsd: kill unused headless stuff 
Change-Id: Ic4ee7603ecd7acd10e4499457de181342f2d7483
Reviewed-on: https://gerrit.libreoffice.org/35735
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-27 03:19:11 +00:00
Ashod Nakashian
b69d5683c3 wsd: log messages upon construction 
Change-Id: Id8f2eeaa1fabf538af0c327a971d35cc17cb3596
Reviewed-on: https://gerrit.libreoffice.org/35734
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-27 03:18:29 +00:00
Henry Castro
d99dbade2b loleaflet: handle annotation reply for Calc documents 
Change-Id: I27d03313bf4cdc43e7356e78424ee236b90c5269
 2017-03-26 11:55:04 -04:00
Henry Castro
5e67e19a6c loleaflet: handle annotation reply for Impress documents 
Change-Id: I47edbc8807f5f7aa5a28b3a4fd79aeebc8026262
 2017-03-26 11:16:49 -04:00
Henry Castro
563b90a20a loleaflet: remove save button of the annotation object 
Change-Id: I1aa19e3620d1bbd3a76fae32e97c4c32adcf0fe6
 2017-03-26 10:19:10 -04:00