Commit graph

2315 commits

Author SHA1 Message Date
Pranav Kant
9669470d09 loolwsd: Admin doesn't need its own thread now
The timers are cancelled upon destruction of the static Admin
instance.

Change-Id: Ie43dc9d3ec96b002e12685ec997ad83c29b684d0
2016-04-15 13:28:42 +05:30
Tor Lillqvist
5c41d4c5ed -Werror=maybe-uninitialized 2016-04-15 10:53:06 +03:00
Miklos Vajna
0a92e811dc Storage: const auto -> const auto& where it would create a tmp copy
Change-Id: I0ec42200e19654ee2e1c9b0fc293668847a5b965
2016-04-15 08:49:35 +02:00
Henry Castro
8fac7d59b4 loleaflet: friendly messages when socket is closed 2016-04-15 00:10:43 -04:00
Henry Castro
39180a0e22 loolwsd: test: add connectLOKit
Connecting to a Kit process is managed by document broker, that it does several
jobs to establish the bridge connection between the Client and Kit process,
The result, it is mostly time outs to get messages in the unit test and it could fail.
connectLOKit ensures the websocket is connected to a kit process.
2016-04-14 21:54:36 -04:00
Ashod Nakashian
0b4b3c73d5 loolwsd: tile cache cleanup
Change-Id: Ib2abec83fd4866c09b30507c11a809d682c2f819
Reviewed-on: https://gerrit.libreoffice.org/24100
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-04-15 01:08:37 +00:00
Ashod Nakashian
322a3c1afe loolwsd: logging moved to own files
Change-Id: Idf1dd91cf37675e1bea8aeb5d9e8cf6d2ac9a725
Reviewed-on: https://gerrit.libreoffice.org/24099
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-04-15 01:07:13 +00:00
Ashod Nakashian
e5595509fd loolwsd: cosmetic cleanup
Change-Id: I02f3ab1778db462376b7563e7e8b0abeebd2e8a1
Reviewed-on: https://gerrit.libreoffice.org/24098
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-04-15 01:04:47 +00:00
Michael Meeks
fe684cc71d looltool: implement destdir, and fix parallelism. 2016-04-14 21:41:09 +01:00
Michael Meeks
444adc976d looltool cleanup add --no-check-certificate option too. 2016-04-14 20:44:02 +01:00
Michael Meeks
53c60b2842 Magic to cleanup autotools module linking of unit tests. 2016-04-14 18:58:18 +01:00
Michael Meeks
688d1ab6e6 Remove confusing ChildProcessSession include on LOOLWSD.
Move the ClientPortNumber into both Kit and WSD.
2016-04-14 18:58:18 +01:00
Michael Meeks
d817fc2c69 Simple command-line tool for file format conversion. 2016-04-14 18:58:18 +01:00
Michael Meeks
349e2a5a49 Add SEGV and trace hunter, and update log parser a little. 2016-04-14 18:58:18 +01:00
Andras Timar
1f7da1f5a2 loolwsd: install and package SSL key and certs if SSL is enabled 2016-04-14 18:47:50 +02:00
Henry Castro
bea5963aa7 loolwsd: avoid time out exception 2016-04-14 12:00:32 -04:00
Henry Castro
d11bd69c26 loolwsd: wait prison session until the peer is assigned
Some messages are not forwarded to the client session, this is caused
by the time the client session is assigned, the prison session,
it is already forwarding to not assigned peer session.
2016-04-14 11:41:15 -04:00
Pranav Kant
0597a1873d loleaflet: Disable toolbar buttons without editlock
Change-Id: I18b067e99ff04073a4065536534fdb0db00285dd
2016-04-14 21:04:56 +05:30
Pranav Kant
c56ef84129 loleaflet: Disable (graphic)selection markers without editlock
Only session with 'edit' permission can move selection handles
and graphic selection handles.

Change-Id: Idc5cf634a13e201016eb4e4135392b917b622ad5
2016-04-14 20:53:54 +05:30
Andras Timar
8f93a5f526 merge loleaflet and loolwsd rpm packages 2016-04-14 17:08:52 +02:00
Tor Lillqvist
fe5f238c08 Exit when receiving an *unexpected* CLOSE frame
Otherwise we will just keep waiting for a line on input from stdin,
which is unhelpful.
2016-04-14 17:45:51 +03:00
Tor Lillqvist
066b48688a Use the 'expected' and 'actual' parameters of CPPUNIT_ASSERT_EQUAL() correctly 2016-04-14 17:07:55 +03:00
Tor Lillqvist
2edf15a18b Use CPPUNIT_ASSERT_EQUAL() to get expected and actual values into output 2016-04-14 17:05:09 +03:00
Andras Timar
2e0d895485 loolwsd: define sysconfdir for deb package 2016-04-14 15:26:51 +02:00
Andras Timar
ea94e957c1 loolwsd: rpm install of config files 2016-04-14 15:14:59 +02:00
Andras Timar
a8601804ac loolwsd: process loolwsd.xml.in 2016-04-14 15:06:49 +02:00
Andras Timar
a9fb211118 loolwsd: move loolwsd.xml to loolwsd.xml.in 2016-04-14 14:59:27 +02:00
Andras Timar
ec9aa4a50f loolwsd: fix SSL certs/key install 2016-04-14 14:50:48 +02:00
Andras Timar
1f560af63a loolwsd: discovery.xml to datadir 2016-04-14 14:43:31 +02:00
Andras Timar
b3e610eba0 loolwsd: do not install unit test shared libs 2016-04-14 14:43:31 +02:00
Tor Lillqvist
0140b1cd43 Always define ENABLE_DEBUG and _SSL in config.h, as 1 or 0
Correspondingly always use #if, not #ifdef, to test.
2016-04-14 13:43:31 +03:00
Andras Timar
60c969cd77 add security.h to tarball 2016-04-14 12:35:50 +02:00
Andras Timar
24bc458741 define LOOLWSD_CONFIGDIR and LOOLWSD_DATADIR 2016-04-14 12:34:11 +02:00
Jan Holesovsky
1e58864230 Revert unwanted change of hello.odt, and prevent that from happening again. 2016-04-14 11:40:17 +02:00
Pranav Kant
d8c9128d35 loleaflet: Let simple 'make' build and install plugins in dist/
... and 'make dist' just copy that over to its package directory.

Change-Id: Ifb3d59c3cdfde23f14bc64b5a358565279a57575
2016-04-14 15:08:01 +05:30
Pranav Kant
5d8e627ca4 loolwsd: Allow 'downloadas' for all kinds of views
... irrespective of whether the editlock is taken or not.

Change-Id: I159f78fb4c58c973458ae2c5bc53e844de689e14
2016-04-14 15:08:01 +05:30
Pranav Kant
95b9674022 loleaflet: Remove leftover code for enable editing/selection
Buttons are removed in e228817a8c

Change-Id: I3a4994d8e3c34ac49c466434d62264e86e11c3a1
2016-04-14 15:08:01 +05:30
Jan Holesovsky
7d64501479 Allow setting the server name and port in loolwsd.xml. 2016-04-14 11:13:55 +02:00
Tor Lillqvist
1bd6cdde3b Util::getSignalStatus() is unused
Good, its semantics was a bit odd anyway.
2016-04-14 11:39:42 +03:00
Michael Meeks
b3f17462eb Fix ENABLE_SSL AC_SUBST. 2016-04-14 09:34:52 +01:00
Michael Meeks
35b27b352c Initial font unit test. 2016-04-14 09:34:52 +01:00
Tor Lillqvist
c7d0067969 Util::getChildStatus() is unused
Good, now the odd LOOLExitCode can go away, too.
2016-04-14 11:30:28 +03:00
Miklos Vajna
63d9112977 MasterProcessSession: const auto -> const auto& where it would create a tmp copy
Change-Id: I5bbffb9be562b52f868bfca3f825e8d81dae4eef
2016-04-14 08:36:56 +02:00
Pranav Kant
171aeee0b7 loleaflet: .gitattributes to ignore minified js files
Otherwise these show up in 'git grep'

Change-Id: I82224673978c63b523750a2ec8b34ca248f4e309
2016-04-14 11:33:32 +05:30
Henry Castro
87eeac808b loleaflet: show "Connecting..." before websocket is ready 2016-04-13 16:30:21 -04:00
Henry Castro
0c6f9b06ed loleaflet: fix js lint errors 2016-04-13 15:34:12 -04:00
Henry Castro
096f7db6d0 loolwsd: report indicator status before websocket is ready 2016-04-13 14:42:46 -04:00
Jan Holesovsky
efb67d68fd The host= parameter for loleaflet.html does not exist any more.
Now loolwsd fills that in directly.

Also show http:// or https:// in 'make run' according to the configuration.
2016-04-13 18:42:07 +02:00
Jan Holesovsky
b09b6eab89 Only the access_token (and _ttl) is supposed to be passed via the form post. 2016-04-13 18:32:00 +02:00
Andras Timar
07b68b37a9 loleaflet: put everything we use to dist/ and package only dist/ 2016-04-13 16:55:46 +02:00