Commit graph

7423 commits

Author SHA1 Message Date
Henry Castro
fef3d53c8a loleaflet: fix foreground and background color
Change-Id: Ib33cbec03e9f9a233540752aa442a984c6d5d665
2018-12-07 12:39:27 +01:00
Henry Castro
54bddfa696 loleaflet: fix select tag drop-down list
Change-Id: I2350ff8a0e17ca9b2709460e3ed333a64d2c76e4
2018-12-07 12:39:27 +01:00
Henry Castro
f57b15f453 loleaflet: fix zoom toolbar item
Change-Id: I4ef14ff08ff2ae782ddea8aec2ecce04d67d1f3b
2018-12-07 12:39:27 +01:00
Henry Castro
0beb1c314e leaflet: add .uno:ResetAttributes toolbar item
Change-Id: Ife550e651dc27558fea09b298b6bb5f45fd03c9a
2018-12-07 12:39:27 +01:00
Henry Castro
cdf7abc548 loleaflet: handle a click event for print toolbar item
Change-Id: Ia785ad9468d7c8226a33e8c2212e115d307ffc26
2018-12-07 12:39:27 +01:00
Henry Castro
63ecdd5d40 loleaflet: update toolbar with new images
...and entries

Change-Id: Ia57f832642db9bd4036f401be3ed736704ce5d6b
2018-12-07 12:39:27 +01:00
Jan Holesovsky
0c69ce5d8e Issue help from the menubar and also during editing when F1 pressed.
Change-Id: I6b07c6881391129a9cc3b44312de08546f912be6
2018-12-07 12:39:27 +01:00
Tor Lillqvist
deb92ad3ba Finally figured out how to get 200x200 cells in the template collection
Change-Id: Idd977ccf52b2dd0e0aaae08f54f6d902791bcc6d
2018-12-07 11:20:15 +02:00
Samuel Mehrbrodt
0a246d8563 docker: apt-transport-https no longer needed
since we don't have any custom repos anymore

Change-Id: Ib6fc8989ed4085b862e3bda5c7136f2022b6d345
2018-12-07 10:12:08 +01:00
Samuel Mehrbrodt
9139bd3330 Docker: Install libpixman
This lib was not found after upgrade to Ubuntu 18.04

Change-Id: I37853f115907ae2e795371ec46eee305f91aeed7
2018-12-07 09:54:19 +01:00
Andras Timar
30b8170fab docker: fix permission (owner) of /etc/loolwsd/key.pem
Change-Id: I9e0a9d8bc8c0fc0119e9c66389c1012023046c89
2018-12-06 23:47:49 +01:00
Andras Timar
70fe177a0f docker: install openssl
Change-Id: I35a223068f67d3a0740968996ec4af9c723873dc
2018-12-06 23:31:40 +01:00
Andras Timar
bea079cfce docker: install libcap2-bin
Change-Id: Ibd6f794190ec2f6f511f6b8546bbcd237a971a43
2018-12-06 23:21:38 +01:00
Tor Lillqvist
da45975a5a Make the template collection view look much better
Now it finally looks like I want, but oh boy was that a pain. I am not
sure at all I understand what I am doing in Xcode's Interface Builder.

I tried hard at first to use the cell size 200x220 for the cell size
of the UICollectionView, consisting of a 200x200 UIImageView and a
200x20 UILabel below. But that did not seem to work, it still used a
(default?) size of 150x150. Weird. Anyway, let's commit this state now
that seems to work.

Change-Id: I4021133619fbf62cd633392d93f19c2bbc81311a
2018-12-07 00:09:13 +02:00
Andras Timar
433c0b43b1 docker: fix libpng dependency
Change-Id: I1ab093460c4cac1fbcb8f37ad54e742d5560206c
2018-12-06 22:47:25 +01:00
Tor Lillqvist
8b106eb312 Look for thumbnails of the templates and show them in the template browser
Add such thumbnails. Rename the presentation templates to not have
colons in their name, as that seems to be problematic for macOS and/or
iOS, sigh. (Shadows of pre-OS X MacOS, where the coln was the path
component separator, not the slash.)

Hack on the storyboard scene for the template browser. More work is
needed there; the thumbnails aren't scaled down for some reason. I
need to make sure the aspect ratio is maintained, too. Maybe to get it
to look like I want I need to do some coding and not just tweak the
storyboard in the Xcode UI designer, sigh.

Change-Id: I959d051352c2f033c8563188155af5281961c7d8
2018-12-06 16:38:50 +02:00
Andras Timar
b26db00c42 docker: we are based on Ubuntu 18.04 now
Change-Id: Ie81ec22081a1d7c71f4f1424a7b61c29b74b46d4
2018-12-06 12:29:23 +01:00
Tor Lillqvist
4c8d0f2e25 Revert "Work in progress: Add .ott"
Using a template has been implemented to work in a way more
appropriate for the platform.

There is little reason to allow direct opening of a template in the
iOS app as long as it don't have any way to save it as an actual
document, based on the template, after editing, (with a different file
name) anyway.

This reverts commit f01a73fa92.

Change-Id: Iff4b2f299c6e6eda27c00e40a49374899af41cf0
2018-12-05 23:41:49 +02:00
Tor Lillqvist
1f0b0b6a0d Bin leftover dummy NSLog() call
Change-Id: I0597be90ff211dfb7f5fd2f321bfb36c9ec01308
2018-12-05 22:13:26 +02:00
Tor Lillqvist
296e0eb803 More work on template selection for a new document
It took quite some time for me to understand how to do it. Not sure if
this is The Right Way, but at least it now works better.

The trick was to store the importHandler block as a property of the
TemplateCollectionViewController and call it when the right template
has been selected.

There is no need to call the importHandler already in the
documentBrowser:didRequestDocumentCreationWithHandler: instance method
and it would not be possible anyway as there apparently is no way to
have the presentViewController:animated:completion: method work in a
truly modal way, so that it would not return until the selection has
been done.

Change-Id: Ia229500c181844fcd99f1f099b2e6744c22b5266
2018-12-05 22:02:59 +02:00
Andras Timar
0c76f3f1db loleaflet: updated pot files
Change-Id: I6a28078b2b9a45651d8f9cad559ab42ad744a183
2018-12-05 20:34:48 +01:00
Miklos Vajna
57a72ea4e9 document signing: inform user after upload
Change-Id: Ic84c64b1aea39e452b169b2e334f7a9ee3dca58f
2018-12-05 17:50:29 +01:00
Miklos Vajna
6e0d1ad707 document signing: whitelist CSP frame-src for doc sign endpoint URL
If document signing is enabled in loolwsd.xml, then explicitly whitelist
iframe creation towards the doc sign endpoint server, to avoid

> Refused to frame '...' because it violates the following Content Security Policy directive: "frame-src 'self' blob:".

Note that this happened only in non-debug builds, as we currently don't
send eny Content Security Policy headers in debug builds.

Change-Id: Iee2a0644d67d5803ab3f5c636b8e960fa619792f
2018-12-05 16:14:44 +01:00
Andras Timar
7c262f5e82 loleaflet: hide Vereign iframe
The insertion was:
g.setAttribute('style','display:none;');
after:
g=document.createElement("iframe");

Change-Id: I3e993e1c26657f3555f8bbf79772600e5551b2cd
2018-12-05 13:33:58 +01:00
Andras Timar
544aafe70a loleaflet: Hide spreadsheet-row-column-frame for text, presentation and draw documents
Change-Id: I5f47faf639dce2d972f219c31d52bfc686c112a9
2018-12-05 13:09:35 +01:00
Miklos Vajna
0b15bd381c loleaflet: completely hide document signing bar by default
This used to be mostly hidden by the document container, but a 1px
horizontal red line was still visible.

Also return early in adjustUIState() to silence errors when the feature
is not enabled in loolwsd.xml.

Change-Id: I140bc5a79bdb85790021f57dd0ab810587bb2529
2018-12-05 12:05:45 +01:00
Samuel Mehrbrodt
2e9af9da16 Add custom http header when saving before document is cleaned up from memory
Change-Id: I3ac417d83a79a665ae6575097835542f43d40cef
Reviewed-on: https://gerrit.libreoffice.org/64499
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-12-05 11:50:59 +01:00
Miklos Vajna
c04fd49d42 TileCacheTests: these writes are never read
They are written again inside the do { ... } while (...) which runs at
least once.

Change-Id: I9ff07d7cb68b73bccf1bd38490fcba615b87a6ba
2018-12-05 09:14:50 +01:00
Andras Timar
521f73fb3b loleaflet: updated translations from Pootle
Change-Id: Ibdb8b359ff215b22859fa2e4d0a551ba12611447
2018-12-04 22:47:50 +01:00
Tor Lillqvist
a3b44f2b8b Work in progress on document creation using templates in the iOS app
When the "Create Document" button in the document browser is pressed,
we scan a set of ODF templates in the Templates subfolder of the app
bundle, and we display that list as a collection view. (So far that
view is not interactive, i.e. once it is displayed, you are stuck
there.)

Eventually, when the user chooses one of the templates, we will open
that and immediately, before the user has done any edits, do a Save As
of it as a real (not template) document in the app's document folder.
What name to use for it is unclear yet. Further saves will thus don't
need any dialog to choose the document name.

More work will be needed on i18n of the template support. Should we
have localised templates? At least localised template names. Etc.

Change-Id: I5675779a5b16bc4c70a943109aa0dd53cf4bd903
2018-12-04 22:12:39 +02:00
Andras Timar
c85f149404 non-breaking space after colon in Sign toolbar
Change-Id: I91dd9642afb905d29eade9272cab257ffa0f97ad
2018-12-04 14:30:16 +01:00
Andras Timar
8347d2578d Enable l10n for most of strings in document sign feature
Change-Id: I5159051b2c42bee26e788766f29244bd2ca2f234
2018-12-04 11:54:20 +01:00
Miklos Vajna
da8785ed50 Log::StaticNameHelper: make members private
Change-Id: I7c46dc6757b98867c4893ee019b3fd6d903020fc
2018-12-04 09:06:58 +01:00
Tor Lillqvist
14cd0f4e2b Add source files from desktoi/source/lib for breakpointing convenience
Change-Id: I36408e7adcd30b1094c41b23254919df43e6542c
2018-12-04 00:58:53 +02:00
Tor Lillqvist
f01a73fa92 Work in progress: Add .ott
Still need to figure out how to ask the user where to save the
documemnt and under what name when closing it.

Or actually, should ask right away, as iOS apps are supposed to be
crash-proof, there shouldn't be any need for any separate "save" or
"close" operation by the user, right?

Change-Id: I6d6b9933f5e21f7793837c7ed65049b82853a183
2018-12-04 00:58:53 +02:00
Tor Lillqvist
191a471e2d Add source files from cppuhelper for breakpointing convenience
Change-Id: I2b61c4b870f944760171a85818f7ecd7883c3e19
2018-12-04 00:58:53 +02:00
Miklos Vajna
85f24ccb55 CRYPTO_dynlock_value: make members private
Change-Id: I5328bd272d4aaef1a445b9ddc5dd4c878d803777
2018-12-03 09:11:22 +01:00
Andras Timar
1dbc88a32b Fix domain name resolution from jail by adding required libs to systemplate
Originally all was good, then ad21717498
removed these files from jail, therefore name resolution broke, then
ac7d67f43e added back libnss_* libs from one location, which
happened to work on developer's computer, then 4e5528e5f8,
b4f15c714a, and 9c0ab72155
added back etc/hosts etc/nsswitch.conf etc/resolv.conf that were also needed for proper
name resolution, finally this patch adds some more possible locations of Name Service
Switch (NSS) libs, therefore it makes sure that the required libnss_* shared libs
are found e.g. on Debian based systems. Also, testing with libreoffice/online docker image
has shown that libresolv.so.2 is also required in systemplate for name resolution, although
on some other systems it was not needed (preload?).

This fixes two bugs:
1) Linked images in documents were not displayed on certain systems
2) Insert image from WOPI host did not work on certain systems

Change-Id: I5d09a65341050f0f729bdbc46977c0f686ac023c
Reviewed-on: https://gerrit.libreoffice.org/64426
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-12-02 18:32:34 +01:00
Andras Timar
25a177db93 typo: capabilties -> capabilities
Change-Id: I44c84d01a2ef6addf7efd5a6cd7fc1778a752c4b
2018-11-30 14:50:15 +01:00
Andras Timar
a41864e8a5 add the /hosting/capabilities endpoint to the example reverse proxy configs
Change-Id: Ia4c2e4a54549af89071752c631a9ae5fed678c63
Reviewed-on: https://gerrit.libreoffice.org/64286
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-11-30 13:46:33 +01:00
Andras Timar
321efe3eaa Depend on nodejs instead, Debian 9 does not have npm package, and node-jake is very old
Change-Id: Ia7ceed8dd38849575a63e96c6296c70e31509eec
2018-11-30 13:35:59 +01:00
Jan Holesovsky
9168040a4d capabilities: Don't rely on existence of the file, compose it completely.
Change-Id: I41588afa9f26b4a2575ee8cf7d9837cc79b31b3e
2018-11-30 13:34:46 +01:00
Tor Lillqvist
c57a1fbef0 Don't show the user indicator if there is nobody else
Especially in the mobile app it was silly to show it as there is by
definition always just one user editing a document, but it is a good
idea to simplify the UI in this case also for the web-based online.

Change-Id: I67533ffe62734dce6ca96e2a72d9ba4386fc9b74
Reviewed-on: https://gerrit.libreoffice.org/64330
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2018-11-30 11:34:24 +01:00
Tomaž Vajngerl
e82c2180d1 Show and check document status when log in into vereign
This shows what the current document status is in the signing
infobar.

When logging in into vereign we need to check the current document
as we have all the needed certificates avaliable.

Change-Id: I7fb4420d0b80a6d0fa553fca2f0be7b6dec6249f
Reviewed-on: https://gerrit.libreoffice.org/64333
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2018-11-30 11:29:34 +01:00
Miklos Vajna
84d224d995 test: no need to copy procEntry
Change-Id: Iac7bca9ebcf104975d01bcd1cdfe8e0f4d2a742e
2018-11-30 08:38:00 +01:00
Tor Lillqvist
637324354d Skip the signature uploading code for the mobile app case
Change-Id: If634c5b1ff77e6a56c9a195d9394c4d2906419cb
2018-11-29 23:46:16 +02:00
Tomaž Vajngerl
7a8c5c072f Add "close" function to the document signing info bar
Change-Id: I24e967de5c2a975ec2f1321c02712761c6d48de3
Reviewed-on: https://gerrit.libreoffice.org/64299
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2018-11-29 22:46:14 +01:00
Tomaž Vajngerl
2861299c77 make vereign server configurable, dynamically show sign. infobar
document_signing_url in loolwsd now accepts a vereign server URL
endpoint. If not provided, the signing functionallity won't be
available.

The document signing infobar is now shown dynamically so by
default it is not shown, but when the users clicks in menu the
"sign document", the infobar is shown (the document-content is
css "top" value is adjusted via JQuery).

Change-Id: I9d5f6b68ba3612eeeb9de28c9c0333b4d1bf41d8
Reviewed-on: https://gerrit.libreoffice.org/64298
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2018-11-29 22:46:07 +01:00
Tomaž Vajngerl
2645829f40 don't assert in this case, better to return
Change-Id: I38cef1185bef0de67bbb579c5c64e2697f953b0b
Reviewed-on: https://gerrit.libreoffice.org/64297
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2018-11-29 22:46:00 +01:00
Tomaž Vajngerl
9e61f831f0 Move toolbar click handling to Signing.js to keep func. together
Change-Id: I0c721a2b7b46f7fe59d7a70deffbdb0b4d96d1af
Reviewed-on: https://gerrit.libreoffice.org/64285
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2018-11-29 21:49:58 +01:00