Commit graph

15730 commits

Author SHA1 Message Date
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
Ashod Nakashian
4c87cc36ff wsd: Close socket hard when necessary
Also clear its input buffer explicitly.

Change-Id: I8badbb96d98eaf10433a65fcfd13b0d6d5893594
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>

Ignore input in a somewhat gentler way.

Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Change-Id: I758302dc3bb1aa87f9fbfa726f73f4b9339e08c2
2021-07-19 17:31:55 +01:00
Ashod Nakashian
90f0360ada wsd: close the connection after failing to load
Change-Id: I571c9afba3ae2d9be83382dab571902669e8b059
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-19 17:31:55 +01:00
Miklos Vajna
18d4c58442 http response: if the result doesn't fit, then consider that a fatal error
This is really a garbage in -> garbage out situation.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: Ic1c33f44081f259e5cf5994ad901e1593fe8dfcf
2021-07-19 13:38:00 +02:00
Miklos Vajna
32a654eecb http response: simplify the condition if the result would fit
Given that "digit" is always less than 16, we can avoid the "- digit"
in the condition (because the division turns that into 0 anyway), making
it effectively constexpr.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: Iaf9e53d3543f2237c00768f214114a02a4746020
2021-07-19 12:42:38 +02:00
Gökay ŞATIR
653c611860 CommentListSection: Remove unused function's call.
Signed-off-by: Gökay ŞATIR <gokaysatir@gmail.com>
Change-Id: I86c5793b33e7edcbe8484fd9d520d31b0eea33ff
2021-07-19 13:38:14 +03:00
Pedro Pinto Silva
280c2b7148 Mobile: Hide scroll indicator for busypopup
since there is no scrollable content

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I2f2dda8df160772a5da766e7c04746f3f6e7bb3e
2021-07-19 10:22:08 +02:00
Pedro Pinto Silva
e0017b8734 Mobile: busypopup: Add class to mobile-wizard and add style
- So we can be sure nothing else is targeted
- Center illustration
- Container goes full width
- Fix Portrait and Landscape modes
- Add border radius so to differentiate this panel (busypopup) that
blocks the ui from any of the other ways we use the mobilewizard

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I2391197477d465636143ca2b55c0723f60a4b339
2021-07-19 10:22:08 +02:00
Szymon Kłos
491ff730be BusyPopup: fix on mobile
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I602c8009b63b686c1f303930d71f77d81df3a6ab
2021-07-19 10:22:08 +02:00
Szymon Kłos
f48a3c6712 BusyPopup: fade out to not flicker
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Ief67c0c221f61af0033aaac7b6be787bb68a3676
2021-07-19 10:22:08 +02:00
Szymon Kłos
3550daf575 BusyPopup: show after 0.7s delay
This will prevent us from flickering if popup has to be shown
for less than 0.7s.

Change-Id: I5904e5f836dae40b83ca24d19e0b2fb779eb504b
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
2021-07-19 10:22:08 +02:00
Szymon Kłos
68e4498a87 BusyPopup: enable for mobile
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: If89a567bd4609ef6993b891a042a7958e4d340d3
2021-07-19 10:22:08 +02:00
Ashod Nakashian
617b1aeae5 wsd: prevent recycling the listening port during tests
When running tests in parallel, closing the server listening
port before all DocBrokers are terminated runs the risk of
the listening port getting recycled by another test. This
means that the new test might get unexpected connections
from the old test that is shutting down.

This improves test stability.

Change-Id: I2c6ac9e7ed9953813e0da6ab19b960b1edc1d1a8
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-18 21:14:48 -04:00
Ashod Nakashian
187caefbfd wsd: test: improve modify test
Change-Id: Ic6f3f81b5481340e5e3350152228f40654460a86
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-18 21:14:48 -04:00
Ashod Nakashian
0d59630b48 wsd: killpoco: cert verification
Change-Id: Ie9bc96183d1e416ef4b9b455eefb1f9249b2f695
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-18 21:14:48 -04:00
Ashod Nakashian
f63d077916 wsd: ssl certificate verification requirements
Change-Id: I72ffa586310296f1986276c3007672c41146c92b
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-18 21:14:48 -04:00
Ashod Nakashian
f702c4efab wsd: support certificate verification
Change-Id: I912595f104e24dc66da9cf06bc211cb0c50c9ff0
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-18 21:14:48 -04:00
Ashod Nakashian
14b694e4b8 Revert "wsd: initialize SSL if enabled or termination is enabled"
The original behavior must be preserved, which is not to
initialize SSL when termination is enabled but SSL is disabled.

This reverts commit 1c9541a6a636647086397e1310084cc990b6ed70.

Change-Id: Iba3ed3eea45b6b78e696334ca4d1a4a2c014d95b
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-18 21:14:48 -04:00
Ashod Nakashian
0690f23ee4 wsd: move isLocalhost to a common area
Change-Id: I2a7986863138a254a6d74644112f5cd60bb898cd
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-18 21:14:48 -04:00
Ashod Nakashian
ae7b0d9a00 wsd: before closing save a copy to upload
If the last upload had failed and we are closing,
make sure to save a new copy (i.e. save even if
unmodified) so we would have the latest version to upload.

Change-Id: I25efb76eaf9c0e05a2d18071b273447803b17cc5
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-17 22:58:23 -04:00
Ashod Nakashian
938f8f9dc1 wsd: test: detect multiple uploads in test
Change-Id: I3bba2f2ea814481531a1cd5e867a54e0cbb9df49
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-17 22:58:23 -04:00
Ashod Nakashian
61954dc67a wsd: track saving activity
This prevents auto-saving while a
save is in progress.

Change-Id: I2606df704482ad54a954414d48ed3ca35d4764a9
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-17 22:58:23 -04:00
Ashod Nakashian
cc23a03dc0 wsd: correctly update the modified flag
There is an important distinction between
internally saving a document and uploading
the latest saved version to storage.

Core reports the modified state, which was
at some point used to flag the modified state
in the admin console. This state is misleading
if uploading failed.

This patch makes this distinction even more
explicit than it was. We now always update
the modified flag given by Core, and flag
the document as modified in the admin console
too.  But we only update the admin console to
unmodfied when we successfully upload and the
document is not modified at that point (which
it might very well be modified again by the
time we finish uploading).

Without this patch, we stop updating the
modified flag when uploading fails. This
is problematic when said failure occures
right before closing the document, because
the document will have no modification
but we will be stuck thinking it is modified.

This combines two commits:
8c602e179e
and
9db39ce741

Change-Id: I31c72aa2491b8e98597075cd35b6a809fab560a1
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-17 22:58:23 -04:00
Ashod Nakashian
9c50fdc155 wsd: better logging of the document activity
Change-Id: I89e673ffa819600bd227fab291a46d9108ed5cca
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-17 22:58:23 -04:00
Ashod Nakashian
84e9732e79 wsd: test close-after-modify to confirm no data loss
Change-Id: I538b0529b318d8a0609798dc0eecadb49861e188
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-17 22:58:23 -04:00
Ashod Nakashian
8ff82c007b wsd: test: correct logging of phase change
Change-Id: If71e5c5a6d6b4fd03d3f4fc98ba59d8ad55d8b0b
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-07-17 22:58:23 -04:00
Szymon Kłos
87cc41eb0b jsdialog: sidebar: add more options buttons for panels
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I49024be7a3a46665f709c1b6a063a25a0d6ddf38
2021-07-17 17:31:53 +02:00
Gökay Şatır
34b6f0d760 Revert "Avoid higlighting additional rows/cols"
This reverts commit a701f7c9094227422457d05cc5d90e9d1a9a7fc0.

I approved this one but it doesn't seem to work well, unfortunately.

Signed-off-by: Gökay Şatır <gokay.satir@collabora.com>
Change-Id: Iafc10a15dcf07aae661e7dd2562c6555f6b83596
2021-07-17 16:35:27 +02:00
Szymon Kłos
d7c985e9b5 jsdialog: handle exception on bad id
issue wrt busypopup sending string id for dialogEvent
was already fixed on JS side.

remove unnecessary comment from commit 48f7449
Ignore conversion error from std::stoull for "busypopup"

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I7640b4f693d9d018ae17acb3a9eb292a2423bb68
2021-07-17 16:35:27 +02:00
Michael Meeks
1c2bbced33 systemplate: ensure we have write access to directories before cleaning.
Some of the folders we setup from the system are:

dr-xr-xr-x 1 michael users 2824 Jun  9 21:05 systemplate/usr/share/fonts/

before adjustment, and resist removal.

Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Change-Id: I8e5a96264b98d8091b205f7469bc46c401f47ab1
2021-07-16 19:25:44 +01:00
Gökay ŞATIR
fc1948da83 Impress: Hide comment list panel when there are no comments on the selected part.
Signed-off-by: Gökay ŞATIR <gokaysatir@gmail.com>
Change-Id: I33b30857d0ada79fe06f72e3e54042a8c5c4a64f
2021-07-16 21:14:18 +03:00
Gökay ŞATIR
9bd5154416 Calc Comments: Improvements.
Hide comment on scroll.

Don't show another while one is being edited.

Remove section properly, it was hanging on the background.

Signed-off-by: Gökay ŞATIR <gokaysatir@gmail.com>
Change-Id: Id0f85d4c84d3741a5120e24055061c2fe183b98a
2021-07-16 21:07:28 +03:00
Gökay ŞATIR
df75abe909 Calc: Hide comment on scroll.
Signed-off-by: Gökay ŞATIR <gokaysatir@gmail.com>
Change-Id: I4852c15891f2467566964524bd7eb05450878ad6
2021-07-16 21:07:28 +03:00
Gökay ŞATIR
09c695a3f1 Calc: Issues with comments.
Open new comments directly in the cell's position, without animation.

Focus on the comment box.

Signed-off-by: Gökay ŞATIR <gokaysatir@gmail.com>
Change-Id: I0dda23baaa9c8cdd940fc9d429e0e72e5464b854
2021-07-16 21:07:28 +03:00
Szymon Kłos
894f77e71c Avoid higlighting additional rows/cols
When used 120% zoom and selected any row after 50
there were multiple rows highlighted.

Change-Id: I4bc5f4272bf65fb0f9d00d96527890281377c0a8
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
2021-07-16 13:20:45 +02:00
Szymon Kłos
556ef0d85d notebookbar: reduce importance of 'not initialized' message
- when we receive any notification - mark notebookbar as initialized
- if we haven't received any information eg. in impress - warn
  reduce importance of this from error to warn as it is not important
  probably there is no widget which sends updates (correct for draw and
impress)

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I88ae3a090014dd25e59e04993c0c244d8830435e
2021-07-16 13:20:45 +02:00
Szymon Kłos
a92c71e3ba jsdialog: style all buttons
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I919f4948962e378fcd4690ca9cfa73fa4a273146
2021-07-16 12:05:19 +02:00
Szymon Kłos
631930da92 jsdialog: handle images
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Ib8b0e17696791a6f9c32ab4e2879d226b7889dfe
2021-07-16 12:05:19 +02:00
Jan Holesovsky
41c0b1add3 Sanitize the css theming.
Change-Id: Id0eb21fc7e7039bf406c074cd210c6c355bd7dbf
Signed-off-by: Andras Timar <andras.timar@collabora.com>

Sanitize the css theming.

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ifccb58c2bc9a070409c9a4dd9e9e4034e7338469
2021-07-16 11:57:43 +02:00
Mert Tumer
cb5a91cce2 Parameters for perf-test
now it's possible to pass parameters
typing_speed, typing_duration, single_view, node_inspect

also replaced the old perf-test with new-perf-test

Signed-off-by: Mert Tumer <mert.tumer@collabora.com>
Change-Id: I03f1f14db4ddd9afb9d4a9a60a87c135497db70c
2021-07-16 10:41:05 +03:00
Mike Kaganski
c13fa52613 Use custom local branch name as explicit remote user branch name for PR
In a scenario where onee has several parallel PRs, one needs to use
several local branches, and when updating PRs, _needs to provide PR
branch name explicitly_ each time (my-PR-name-* in the example):

  git checkout featureFoo
  [ edit session ]
  git commit
  ./g review my-PR-name-1
  git checkout featureBar
  [ edit session ]
  git commit
  ./g review my-PR-name-2

This changes the processing, so that when the user's local branch name
is different from the tracked branch name, it is treated as if user
used that name explicitly in a call:

  git checkout -b featureFoo origin/master
  git checkout -b featureBar origin/distro/collabora/co-6-4
  [ ... ]
  git checkout featureFoo
  [ edit session ]
  git commit
  ./g review # this uses "featureFoo" as implicit second argument
  git checkout featureBar
  [ edit session ]
  git commit
  ./g review # this uses "featureBar" as implicit second argument

so no need to remember which PR name was used where.
This only works for local branch names that are not equal to a remote
branch name, or to the last part (after last /) of any distro branch.

Signed-off-by: Mike Kaganski <mike.kaganski@collabora.com>
Change-Id: I8b95f92f6e205e3c93ef30f4813f3549c2315872
2021-07-16 08:53:58 +02:00
Rash419
506509cdcd cypress: make some tests more stable
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I61b963771c05d8f45140404c58325638b4e03b58
2021-07-16 12:23:17 +05:30
Rash419
5ea11097b9 cypress: enabled some tests
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I34473c4b471b30d05be61e27ecb33d5ad430f2c3
2021-07-16 12:23:17 +05:30
Mert Tumer
1e015b3d07 moved initializing fontcombobox with select2 to Toolbar.js
This way both notebookbar and classic toolbar will have the select2
styling

Signed-off-by: Mert Tumer <mert.tumer@collabora.com>
Change-Id: I9b8294cb1c0308fcfeeed8f9e886e3075c2eb3a1
2021-07-15 21:15:00 +03:00
Gökay ŞATIR
c3f6d9fbd4 ScrollSection: Make vertical scroll bar always visible on desktop.
Signed-off-by: Gökay ŞATIR <gokaysatir@gmail.com>
Change-Id: I39cfe37dddc603cc35a4cb02a2bfd45db224df52
2021-07-15 18:53:21 +03:00
Gökay ŞATIR
82d5a9c185 Cypress: Workaround for a bug inside the library.
Signed-off-by: Gökay ŞATIR <gokaysatir@gmail.com>
Change-Id: If8689bbc9505d05d8343b624cb0213a583f362a2
2021-07-15 18:18:11 +03:00
Henry Castro
21aa279659 loleaflet: check the 'statusindicatorstart' label
The LO Core server will send the label of the status
indicator start.

Change-Id: Ie33aa56fcf2bb87362ad91c79498292c51bd32a8
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-07-15 15:21:24 +02:00
Henry Castro
f43c4b32e5 kit: add payload to 'statusindicatorstart'
Change-Id: I3145c6c622204e4c4898c8490176baff39b07636
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-07-15 15:21:24 +02:00
Rash419
046dbb72f9 cypress: disabled failing tests
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: Ia302f05f2524c446f32b7baccdd86d25766b1707
2021-07-15 17:54:02 +05:30
Michael Meeks
823c30b39b Ensure that we get the file-name right before sending the save result.
We cannot rely on wsd being slower than the kit. The rename
has to happen before wsd / DocumentBroker gets to trying to access
the filename. fixes #2874.

Change-Id: Ie1e67cd059fb6a663048967c47759238c067172d
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2021-07-15 09:08:06 +01:00