summaryrefslogtreecommitdiff
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2019-12-06remove bundled LOKit headersAndras Timar1-5/+7
It was a source of confusion that these bundled headers had to be synced with core all the time, and when it did not happen, the builds broke. Change-Id: Id9d0a8a496b293d20c39e855176a00bcb85df640 Reviewed-on: https://gerrit.libreoffice.org/84358 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-11-26deb: trigger systemplate update after apt operations (e.g. installation of a ↵Andras Timar1-0/+1
new font, etc.) Change-Id: Ia356249598d2f451d135985511b0fce71335a28d
2019-11-25Add REST endpoint for admin metrics.Gabriel Masei1-1/+2
Change-Id: I701485631931334d27594c4907cb770f9888e5bf Reviewed-on: https://gerrit.libreoffice.org/82492 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2019-11-21add wsd/ProofKey.hpp to dist tarballAndras Timar1-0/+1
Change-Id: I99a018ad2194f124df9e7a373f9268ba33b0a5e1
2019-11-21Initial implementation of proof-keyMike Kaganski1-1/+2
Change-Id: I7ab79218ca2af268dd4573cb64c6353dc71b5f03 Reviewed-on: https://gerrit.libreoffice.org/82232 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-10-18add kit/Watermark.hpp to dist tarballAndras Timar1-1/+2
Change-Id: I40eda4254657f0c92fa9bc5038416d2d3359ba6b Reviewed-on: https://gerrit.libreoffice.org/81097 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-10-08Remove lo_template_path optionAndras Timar1-5/+5
It was not very useful to let this setting configurable by the user. On the other hand, old path in config file caused issues after upgrade. It is better to decide the location of LOKit core during compilation. From now on the --with-lo-path configure option is compulsory. Change-Id: Icdcbc21bde5dad329fdb6e30ed17efde6b0e73de Reviewed-on: https://gerrit.libreoffice.org/79943 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-09-12add init script for RHEL6/CentOS6Andras Timar1-0/+1
2019-08-05clipboard - set it with a post now.Michael Meeks1-1/+1
Change-Id: I6b9234988185984335408da502f479ccda8a95a7
2019-08-05clipboard: factor out parsing, and add checks in unit test.Michael Meeks1-0/+1
Change-Id: I8c23b10769293b07cc94fdc0d6110e9d540a16b9
2019-06-20android: make clean should clean the assets too.Jan Holesovsky1-0/+4
Change-Id: I1cb2ddb1a7ed71234a5ffc9bdf3631d701df6e5c
2019-05-29Revert "Allow 'make run' after 'make build-nocheck'"Miklos Vajna1-1/+1
This reverts commit 1e84ea37c73283a9c2e2e8fa26fc73aa070f338b. This is no longer needed, at least not for the sanitizers. Change-Id: I70774525ce322870d0c6d625f33e6fd2476d9b5e
2019-05-23Allow 'make run' after 'make build-nocheck'Miklos Vajna1-1/+1
This is useful for the sanitizers build, which can build the code, but not yet the tests. Change-Id: I02a0493dd18cf68f68572cd08af22d0f7805d97a
2019-04-08Fix copy/paste errorSamuel Mehrbrodt1-1/+1
Change-Id: I073feea761579ac9f196c430b8a6745811ee31fd Reviewed-on: https://gerrit.libreoffice.org/70417 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2019-03-15Revert "configure: add libraries from Boost Locale to the linker"Jan Holesovsky1-1/+1
This reverts commit 21315768c05fe5fdba85bcab41c4c2032fa8e367.
2019-03-05configure: add libraries from Boost Locale to the linkerHenry Castro1-1/+1
Change-Id: Icd56a9d18cd42c0300430a5ba1ef4e866b93ccdb
2019-02-21Integrate browser-syncSzymon Kłos1-0/+9
Tool to automatically reload used .css and .js files. To make it work symlinks are created instead of a copy if browsersync is enabled. 1. install: npm install -g browser-sync 2. use configure option: --enable-browsersync 3. remove loleaflet/dist directory 4. run server: LOOL_SERVE_FROM_FS=1 make run -j10 5. run browsersync: browser-sync start --config browsersync-config.js or make sync-writer Change-Id: Iebee1cc0b9a03bc866954ff33e3cb8a10b48e0af
2019-02-15Remove unnecessary leftovers after Michael's removal of the on-disk tile cacheTor Lillqvist1-20/+6
Change-Id: I435679b48f90d2580bb9c5c86a26c9a1d43c5b59 Reviewed-on: https://gerrit.libreoffice.org/67885 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2019-02-13android: Create the html, js and css and copy it to the right place.Jan Holesovsky1-7/+4
Change-Id: I3efbba0ae369387796e2d08b3003e4f469610dda
2019-01-23test: use the more effective overload accepting a character for find_last_of()Miklos Vajna1-3/+0
Instead of the one that takes a string literal consisting of a single character. Also remove the clang-tidy target, 'run-clang-tidy' does a better job of doing the same today. Change-Id: I58f55a0e64af42694d55f9588f25618164275852
2018-11-29Extract Authorization out of Auth and put it into commonTomaž Vajngerl1-0/+2
This is needed so we can use this inside ChildSession. Change-Id: I88f2cc767412fd52dbb242938f0f9897d4277639 Reviewed-on: https://gerrit.libreoffice.org/63836 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2018-11-21add net/FakeSocket.hpp to Makefile.am, otherwise missing in the tarballRene Engelhard1-0/+1
2018-11-07Convert wsd/reference.txt to Markdown formatAndras Timar1-1/+1
Change-Id: I393a74337293e376b6458a9cc05ba1d8b748e0d3
2018-11-01take hello-world.ods and hello-world.odp out of version controlAndras Timar1-0/+10
Change-Id: I108e1a0e0981a50f35c7637f00fa15f8cf9d33c3 Reviewed-on: https://gerrit.libreoffice.org/62725 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-10-30Avoid automake warning about ETAGSTor Lillqvist1-1/+2
2018-10-27add webserver config snippets to distribution tarballAndras Timar1-0/+10
Change-Id: Id8b782ab534f9534cde28b4c9a26dcbfddf8f835
2018-10-17Build the GTK+ testbed app using autofooTor Lillqvist1-1/+1
Rename the gtk/gtk.h file to gtk/gtk.hpp to not have it confused with the actual GTK+ <gtk/gtk.h>.
2018-10-17Build just loleaflet in the --enable-gtkapp case, tooTor Lillqvist1-0/+7
When I fix the gtk+ testbed app to use autofoo, that subdirectory will be built, too.
2018-09-03Factor out loleaflet/dist construction for iOS app buildingTor Lillqvist1-0/+8
The idea is that on a Linux box you have a tree of online that you configure with --enable-iosapp. Then running 'make' there will only create the stuff in loleaflet/dist. That loleaflet/dist can then be copied to the Mac where you build the iOS app. (To me, this approach seemed for now simpler than to get all the PKG_CONFIG etc stuff working that running configure normally requires, and run all the node, npm, and associated crack, on a Mac.) Change-Id: Id2e495d0521922d0666fdab5fdcb5fcd460136f1
2018-08-23wsd: make loolmount before setcap on itAshod Nakashian1-1/+1
Change-Id: Ide93a347513d85d0c6349f364b3a28127e3d2882 Reviewed-on: https://gerrit.libreoffice.org/58298 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-08-03Fix systemplate creation when running make with -j.Jan Holesovsky1-5/+5
Change-Id: Ifcf45b01fdba9b502b1a88190d6a0d4cb316c566
2018-08-03wsd: Kill --nocaps, and use --o:security.capabilities="false" instead.Jan Holesovsky1-3/+3
The --nocaps apparently stopped working when the security.capabilities was introduced. Change-Id: Ieee173e97b62eb4e254667bd105826486e6bdbcb
2018-07-12Drop noise outputTor Lillqvist1-1/+0
Make prints the sudo setcap commands it executes, no need to additionally echo "Set required capabilities". Especially as "set" can be misunderstood as being in the imperative mood, telling the developer to do something, instead of being past tense telling what was done on the previous line. Change-Id: I1138fa28a4d08b57d55552d0e012dcfd778b423c
2018-05-14loolsocketdump is an internal utility, not for packagingAndras Timar1-2/+3
Change-Id: Iaab93f1820266d3fcab01fefbdc62149de0472b5 Reviewed-on: https://gerrit.libreoffice.org/54305 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2018-05-14Add man pages for installed binaries/scriptsAndras Timar1-1/+8
Change-Id: I62c0fd29ab2b8e92522514010f4aa4981edc10cc Reviewed-on: https://gerrit.libreoffice.org/54306 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2018-05-09typo: TILECHACHE_PATH -> TILECACHE_PATHAndras Timar1-6/+6
Change-Id: I740a254d1bc7e4a21f6e48ef5f8f5c933bf7c617
2018-05-09use local tile cache directory for testsAndras Timar1-6/+16
Change-Id: I4c66a45df93bee22131c5950029cffa863d397b0 Reviewed-on: https://gerrit.libreoffice.org/54028 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2018-05-09do not distribute unused or internal dev tool binaries: loolmap, loolmount, ↵Andras Timar1-3/+6
loolstress Change-Id: Ice905d08a695805f594df5731039f747ac88cf28 Reviewed-on: https://gerrit.libreoffice.org/54027 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2018-05-09rename looltool to loolconvertAndras Timar1-2/+2
Change-Id: I9e87c4a142bf63a8a7494861457660ab243e0924 Reviewed-on: https://gerrit.libreoffice.org/54025 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2018-04-25Targed for running loolwsd under gdb.Jan Holesovsky1-0/+14
Change-Id: Id3e946f90b7e61d67b2cee34276a58501380b96d Reviewed-on: https://gerrit.libreoffice.org/53447 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2018-04-17Initial websocket test tool for remote admin connections.Michael Meeks1-1/+6
Change-Id: I8be2068bf7d77c70720a044556d11f5fc80b2f0c
2018-04-17Move UnitHTTP code to header to avoid linking trouble.Michael Meeks1-1/+0
Change-Id: I430110e840fa8b3862c21c1d4e02288ed704e0a3
2018-03-19Allow running without seccomp and capabilities.Michael Meeks1-4/+0
There are some significant security trade-offs here which are now at least configurable. Change-Id: I1d879d69e91392f4ccf5db250a2277f53df60db7
2018-03-09Revert "enable make parallelism"Andras Timar1-1/+0
Bad idea, 'make check' does not tolerate parallelism. This reverts commit 2e4ecfaf4475fd13c510c186f8f79c1cd38228c6.
2018-03-07add JsonUtil.hpp to dist tarballAndras Timar1-0/+1
Change-Id: I41d1e56ff817142670caafb4a260b76f8f0003f9
2018-02-28enable make parallelismAndras Timar1-0/+1
Change-Id: Ie16a450bee6d718d8daf58194fbbd7dfd1ac2f38 Reviewed-on: https://gerrit.libreoffice.org/50470 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-02-15wsd: handle request for robots.txtAndras Timar1-3/+1
Change-Id: Ib82db2ee8c878e6a61b62b49ceaeb72e2d05718d Reviewed-on: https://gerrit.libreoffice.org/49819 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-02-04Adds ENABLE_SETCAP build variable to avoid using env in build system.Christian Glombek1-7/+7
Change-Id: Id38d2225238f8b3a48481a08e62cfa7544958cc9 Reviewed-on: https://gerrit.libreoffice.org/49097 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-01-26Add run-strace target for easy stracing.Jan Holesovsky1-0/+15
Change-Id: I554cfa3965784803430a4cc2c12e61002e2445cd
2018-01-23Add PAM supportAndras Timar1-1/+1
Possibilities are endless. With a simple /etc/pam.d/loolwsd config below, the user which runs loolwsd ('lool' in production environment) can login to admin console with normal linux password. auth required pam_unix.so account required pam_unix.so Change-Id: I354a7e9b4705e8fe346d17d6b6041d1406198b37 Reviewed-on: https://gerrit.libreoffice.org/48307 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>