Commit Graph

210 Commits (6e45fae6c5a8bf02b6bdaae2381b9f64ef8cfe33)

Author SHA1 Message Date
Andras Timar 6e45fae6c5 rename coolstress to jsstress
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I5d0346be60451699502f3723f781bc8488e114f5
2021-11-16 11:16:45 +01:00
Andras Timar cde4d9322e add compatibility symlink 'loolconfig' for 'coolconfig'
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I4715b4469d5f11f63eff4b76651eee549000c1c2
2021-11-15 22:07:53 +01:00
Gleb Popov b88708aac3 Don't enable SECCOMP by default on !Linux systems.
Signed-off-by: Gleb Popov <6yearold@gmail.com>
Change-Id: Ib971a94d3ff18353cdb2a2024f78875e9ff6d8b5
2021-11-13 17:02:02 +01:00
Andras Timar a8bb765eaf Bump version to 21.11.0.1 (RC1)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I5c2ec902a507e3ffbc8c219f2b4e79bc8e2fedcb
2021-11-11 16:26:06 +01:00
Andras Timar e1c1946afb more descriptive name of a config setting for debugging: browser_logging
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I175e5256fcae42477cb2c84fc2b4048aca40bed7
2021-11-11 13:26:37 +01:00
Gleb Popov 2716cc7155 Set --disable-setcap as default for !Linux platforms
Signed-off-by: Gleb Popov <6yearold@gmail.com>
Change-Id: I67e211a94870e46b19426c68d599e7048543a8f5
2021-11-11 12:42:09 +01:00
Henry Castro 8a4b111e8f rename var LOLEAFLET_LOGGING to
COOL_LOGGING

Change-Id: I155a829b3ad947e03363e5020aa71a104aaa8c00
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-11-10 17:18:56 +01:00
Henry Castro e68827b168 configure: update file
rename loleaflet -> cool or browser

Change-Id: I6b28620bb6df981e2bdafe6c712f1cbc43cf3a47
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-11-10 17:18:56 +01:00
Henry Castro e0fe47be5f rename loleaflet.html -> cool.html
Change-Id: Iaa28f1269f8192755ec323396ae4ff054529f412
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-11-10 17:18:56 +01:00
Miklos Vajna 1190f85d27 configure: extend --enable-fuzzers description
To make it more clear that if you enable this in an existing build tree,
you'll get an outdated loolwsd binary, which is confusing.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: Iaf6e747a9d7ac4262732c3df69bb5012bc7dc352
2021-11-04 11:26:46 +01:00
Andras Timar 65ab76ffee Use version 21.11 for the next CODE/COOL release
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I40ddff0825963454580335f444443d31d395429e
2021-10-22 16:03:52 +02:00
Pranam Lashkari 88601440d0 introduce way to hide/restrict uno commands
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I1225190a67f726832e5b38a7c3f690b51c1385f3
2021-10-21 12:28:13 +03:00
Andras Timar a894f87f73 Bump package version to 21.06.2.0-1
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I6c59902f7065f2ff92ce12abcd9548cc3d64a66f
2021-10-14 16:00:48 +02:00
Tor Lillqvist 91c6c4d0da Introduce --enable-bundle to decouple bundling from --enable-debug
Without --enable-bundle, --enable-debug works as before: Individual JS
and CSS files are sourced in loleaflet.html.

But with both --enable-debug and --enable-bundle, a non-empty
bundle.js and bundle.css is produced and that is used instead. It is
important for developers to be able to test also the use of bundle.js
because there can be significant differences in behaviour. Developers
typically have to use --enable-debug because otherwise there are
various stict run-time checks in the C++ code that you don't want to
bother with when developing, like having a separate login for COOL.

Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: If7d0220b7910fe0f7a2f391b856cd0dedc788152
2021-10-14 10:38:01 +03:00
NickWingate 4b03e5d193 Add fourth number to LOOLWSD versioning
E.g. 21.06.1 can now be 21.06.1.0

Signed-off-by: NickWingate <nicholas.wingate03@gmail.com>
Change-Id: Ib7db15dfafa06c4ddcdef28a8831a91bb847a389
2021-09-28 11:14:28 +02:00
Andras Timar 30ef4a62d5 fix Lintian errors: binary-or-shlib-defines-rpath
E: loolwsd: binary-or-shlib-defines-rpath usr/bin/loolconvert /snap/loolwsd/current/usr/lib
E: loolwsd: binary-or-shlib-defines-rpath usr/bin/loolconvert /opt/poco/lib

These RPATHs are not needed when we statically link poco, as we do with production
packages.

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I5050fe1f1925937388793d443020fdc6a14ec97d
2021-09-25 19:04:59 +02:00
Pranam Lashkari daef96dcb3 freemium: corrected typos
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: If21f4471b3ad4b20f049e2e9f2330e31989ead0b
2021-09-01 09:44:19 +02:00
Henry Castro 9266fa5793 add option --with-feedback-location
Change-Id: I2f5b1556f0b976e9c3cb1f78383d2d05e6aef892
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-08-06 17:21:18 +02:00
Henry Castro c8e2d25d24 add initial feedback option
Change-Id: I9357f556474e5ada881e27983c95f7527b284efc
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-08-06 17:21:18 +02:00
Pedro Pinto Silva 6e64ffeba0 Freemium: Dialog: Improve default text, rewording
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I1be4a06e8159050e578c2da319a3b99a982302b2
2021-07-20 14:41:18 +05:30
Pranam Lashkari e02e1df76d Introduce Freemium options
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: Ib6b68ff74839cf84f2d8c8cfb7d380be9209f923
2021-07-20 14:41:18 +05:30
Tor Lillqvist 51b4f74960 Rename the Trace Event log to have the extension .json as that is what it is
Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I46ab020ff0950decff1578fe20949b4494c63732
2021-06-21 12:43:17 +03:00
Ashod Nakashian e0934a3382 configure: allow for setting --with-lo-path with --enable-fuzzers
But if lo-path is missing with fuzzers, it's acceptable.

This allows for generating the systemplate when the
fuzzers are enabled (for example when doing a clean
build that removes the systemplate too).

Change-Id: I43fac66563fa5e2255daf0c8878b4ffca99ae0b0
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-06-13 12:10:24 -04:00
Andras Timar 9e1bd7ec0c Bump version to 21.06
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ib60eabac115766b0501b2c44178b14fedb1c2f20
2021-06-03 10:56:59 +02:00
Tor Lillqvist 37e01c064c Enable building the iOS app completely on macOS
The intent is that it should no longer be necessary to do the
JavaScript part on a Linux machine. For the configury and "make" part,
mostly just some minor portability issues had to be handled:

(But it is still possible to do it the old way, too. This is mostly to
not have to bother with installing Node.js on the CI macOS machine
now.)

The readlink command on macOS has no -f option. But that use of
readlink is not necessary anyway in a tree for building a mobile app,
so bypass.

The find command on macOS always requires at least one directory name.
So when $(CUSTOM_ICONS_DIRECTORY) is empty the "find
$(CUSTOM_ICONS_DIRECTORY) -name '*.*'" command produced an annoying
error message. Handle that in a trivial way.

The echo command in /bin/sh on macOS does not have the -n option. Use
the more portable printf command instead.

To then configure and run the make (before you can do the actual build
in Xcode9, you need have Node.js installed. Personally I just
downloaded the macOS Node.js binary tarball and unpacked into
/opt/node so that /opt/node/bin/node and /opt/node/bin/npm are the
relevant executables.

You will also need to add the lxml and polib Python modules to your
user Python module library with pip3, as in "pip3 install --user lxml"
and "pip3 install --user polib".

Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I263a318181125fa37ac174fa36cb0e44e56a6607
2021-05-24 11:12:39 +03:00
Andras Timar 24aaa0dcd4 3 new build-time configurable settings
Now it is possible:
- to disable Help buttons and jumping to external website of Online Help (--without-help-url)
- set the icon theme of tunneled dialogs and sidebar (--with-core-icon-theme=<theme>)
- set the list of allowed dictionaries (--with-dictionaries=<language list>)

This patch obsoletes the packaging hacks that we had to use for certain customers.

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I450f66ac133f6fcefae2bda9f29e04405ef3a6b7
2021-05-18 09:14:00 +02:00
Tor Lillqvist fd1910c727 The Chrome format is called Trace Events, not Event Trace
Change-Id: I2515182d9369c3a25727dce0d3790e79de891bff
Signed-off-by: Tor Lillqvist <tml@collabora.com>
2021-05-04 15:12:14 +03:00
Andras Timar 0ab307c8db New versioning scheme: 21.05.x
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I9f27b549225604ee10bbef8670bd77db73f24ccf
2021-05-04 13:14:15 +02:00
Tor Lillqvist be476d23b3 Produce a Chrome Event Trace file
It is (for now) produced (by the ProfileZone things in core) whenever
logging level is "trace". The Event Trace file pathname can be given
in the loolesd.xml file or on the loolwsd command line.

Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I6d5829121e71460a4600ee94d2ebf51043c8893f
2021-05-03 16:09:35 +03:00
Andras Timar 7713379d94 we use micro version a lot, let's add it back
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I15e74de7f757b76eb303b11bfd93187aefc61f0b
2021-04-16 16:41:54 +02:00
Michael Meeks f732e00918 Allow easy configuation of the user-id that is accepted.
So if you're debugging the product build you can use:

 --with-user-id=`whoami`

Change-Id: I3f753b83c0806729d36d45293bc2b6a38d50fdbb
2021-04-16 15:40:28 +01:00
Andras Timar 41c5cddc3d forward port packaging bits to master branch
The next version of Collabora Online will be version 2021.
Development of version 2021 will be carried on master branch
for the time being.
The corresponding core branch is distro/collabora/co-2021

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I9c97aaac711c9e1f1e48ed25066b169ea7e26e84
2021-03-31 18:29:49 +02:00
Emil Velikov ed85b0a9d9 android: Add support for split APKs to gradle
Currently a single huge APK is produced. For GooglePlay that doesn't
matter since since they require a complete bundle, while creating
stripped and optimised APKs per device.

For alternative downloads - be that directly or via fdroid-like repo
currently we download/store about four times more information than
needed.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Change-Id: Ic43ef6a3f3e072323ecd57448552379113123e9c
2021-03-16 18:05:45 +03:00
Tamás Zolnai fde1d4c529 cypress: prefer chromium over chrome.
With chrome tests sometimes fail on starting
the chrome binary.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Id5c6af71efad8622b3885b8904f2ef3ede82d631
2021-01-18 13:36:26 +01:00
Michael Meeks 136f20b386 Use jsdom to load and execute our CSS, HTML and JS.
Change-Id: Ia7414e1fd19bf7ebfa29274d1acac5cee4837341
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2021-01-16 12:18:47 +00:00
Gleb Popov d6de33d9e4 configure.ac: Require pkg-config on all platforms except Darwin.
Signed-off-by: Gleb Popov <6yearold@gmail.com>
Change-Id: I33cde2c69fe77b6b226b431eee9ca1853d1d2e6b
2020-12-17 11:52:18 +00:00
Gleb Popov 3cea82d6fd configure.ac: Extend some Linux conditionals to the FreeBSD case.
Signed-off-by: Gleb Popov <6yearold@gmail.com>
Change-Id: Ie4bce494ee81308d9b0236a1d814513761e84226
2020-12-17 11:52:18 +00:00
Henry Castro a2ba233d22 configure: replace obsolete configuration links
The "AC_LINK_FILES" is replaced by "AC_CONFIG_COMMANDS_PRE"

Change-Id: I4821f56e437faa0a9adc523b31ac4c5905c4276e
Signed-off-by: Henry Castro <hcastro@collabora.com>
2020-11-30 08:56:11 -04:00
Gleb Popov 57eab254ca On FreeBSD, link to libexecinfo and libz from base. Require 3rd-party libiconv.
Change-Id: Id8ca0524d3a557e284897665d0e48de933d131d3
Signed-off-by: Gleb Popov <6yearold@gmail.com>
2020-11-16 14:02:23 +00:00
Andras Timar 858df3ddc4 set the INFO_URL for the community project
Change-Id: Ib16b7e387397d27e4debf026c8448990f9a0b97a
2020-10-05 10:45:06 +02:00
Andras Timar 34bc966d68 change product name
Change-Id: Ic34d324c952364442d3f4f9f0758676ab57c8a9a
2020-10-02 14:18:28 +02:00
Andras Timar 2dda7bf815 Update bug report URL and home page in AC_INIT
Change-Id: I749554fa899c24ed8d95b230f75f9a03ea5e1b85
2020-10-02 11:29:01 +02:00
Tor Lillqvist 883ba58a15 Use Automake flavour "foreign" so that it doesn't require a README
(We only have a README.md now.)

Change-Id: I4e693781340aa8d22f83b8565b6617f4ce4d7fb7
2020-10-01 18:23:18 +01:00
Andras Timar e9e6d981e3 nodejs >= 10.0.0 is required to build loleaflet
Change-Id: I4541044e090e85514004b941b6e57986479095cd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103095
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-09-21 16:27:31 +02:00
Tor Lillqvist 3e26dd17b6 AC_SUBST is enough for ENABLE_BROWSERSYNC
Change-Id: I326b92817ecddcfe94f850b8c36e8644aa0bee60
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99289
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-07-23 16:43:16 +02:00
Tor Lillqvist 25cda6de57 AM_CONDITIONAL is enough for ENABLE_CYPRESS
The only use of ENABLE_CYPRESS is the 'if ENABLE_CYPRESS' line in
cypress_test/Makefile.am.

Change-Id: I5790b99f5fb437dd8ee5d0574189fd224eb3e4fe
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99288
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-07-23 16:43:02 +02:00
Tor Lillqvist f0350a6fa1 We don't check ENABLE_SETCAP in any source so no need to AC_DEFINE it
AC_DEFINE causes it to be in config.h, but there is no code that would
use its definition from there.

It is enough to have AM_CONDITIONAL for it (to enable having 'if
ENABLE_SETCAP' in Makefile.am files) and AC_SUBST it (to enable having
'@ENABLE_SETCAP@' in Makefile.am and *.in files).

Change-Id: Ia00b624114c8139d81bb173c92800ae0a62fec35
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99287
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-07-23 16:42:36 +02:00
Jan-Marek Glogowski c45d8197a6 Report better SSL state for mobile apps
I tried to enable SSL, because I didn't want to be insecure, as
stated by the message "insecure: ssl disabled". But for mobile
apps the whole communication is actually local and SSL no any
support option, so this is hopefully a better message.

Change-Id: I35c50772ed49910997b80e6f449483da21775120
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98552
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-07-11 11:59:14 +02:00
Andras Timar bab4380e6d default product name: LibreOffice Online Personal
Can be changed:
* configure --with-app-name
* brandProductName in loleaflet/dist/branding.js

When there is no brandProductName defined, this message will
appear in About box:

"The Personal edition is supported by volunteers and
intended for individual use."

Change-Id: Iec5aa2df7e734bdbc1dd8037656334f0016a7a82
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97837
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-07-05 13:29:38 +02:00
Jan Holesovsky 8da992df35 android: Default to building just the simple case: armeabi-v7a...
... unless more builddirs are provided in --with-lo-builddir, separated
by colons.

Change-Id: I49946cd932ec22804ecb51aba86f3dae2aba05f5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97672
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-07-02 12:04:44 +02:00