Commit Graph

46010 Commits

Author SHA1 Message Date
Daniel Kesselberg b8311b0dd5
Merge pull request #12697 from nextcloud/backport/12649/stable14
[stable14] Make acceptance tests for comments more robust
2018-11-27 21:25:10 +01:00
Daniel Calviño Sánchez 876ee0fd76 Wait for the comment to be added before changing to another file
If the server is too slow, changing to a different file immediately
after sending a new comment but without waiting for the comment to be
shown for the original file could cause the new comment to be shown for
the current file instead.

This is, indeed, a bug in the comments. However, it is not possible to
test it reliably in the acceptance tests, as it depends on how fast the
server adds the message and how fast the client changes to a different
file; sometimes the test would fail and sometimes it would not.

Therefore, now it is waited for the comment to be added before changing
to another file, as in this case it can be reliably tested that changing
to a different file does not cause the comments from the previous file
to be shown in the current file (this was a different bug already fixed
and due to which this test was added in the first place).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-27 16:56:38 +00:00
Daniel Calviño Sánchez fc0a1d1015 Wait for the empty content element to be shown
When the "Comments" tab is open the empty content element is always in
the DOM, although it is only shown once the message collection was
fetched and there were no messages. Due to this it is necessary to
explicitly wait for it to be shown instead of relying on the implicit
wait made to find the element; otherwise it would be found immediately
and if the collection was not fetched yet it would not be visible,
causing the test to fail.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-27 16:56:38 +00:00
Roeland Jago Douma 2706bc7df7
Merge pull request #12684 from nextcloud/backport/12650/stable14
[stable14] Fix count on string
2018-11-27 16:28:56 +01:00
Daniel Kesselberg 5c10df6d2d Add return type
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-11-27 13:16:28 +00:00
Daniel Kesselberg 375ece362d Fix count on string
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-11-27 13:16:28 +00:00
Nextcloud bot 5fc0565695
[tx-robot] updated from transifex 2018-11-27 01:11:51 +00:00
Morris Jobke 24c4ab8265
Merge pull request #12639 from nextcloud/backport/12556/stable14
[stable14] extend anonymous options to work on every dav url
2018-11-26 11:02:46 +01:00
Nextcloud bot fd3e080aa6
[tx-robot] updated from transifex 2018-11-26 01:11:41 +00:00
Nextcloud bot 1901b750c7
[tx-robot] updated from transifex 2018-11-25 01:12:33 +00:00
Nextcloud bot 5238d79452
[tx-robot] updated from transifex 2018-11-24 01:11:37 +00:00
Robin Appelman ff9093e183 extend anonymous options to work on every dav url
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-11-23 19:37:52 +00:00
Daniel Calviño Sánchez c55054e2a5 Rename "FilesSharingAppContext" to "PublicShareContext"
Having both "FilesAppSharingContext" and "FilesSharingAppContext" was
confusing, so "FilesSharingAppContext" was renamed to a more descriptive
name.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-23 15:14:49 +01:00
Daniel Calviño Sánchez 6be19a5ca3 Extract locators and steps for sharing in Files app to their own context
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-23 15:14:49 +01:00
Daniel Calviño Sánchez 2af399f0ae Extract sharing related acceptance tests to their own feature files
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-23 15:14:49 +01:00
Daniel Calviño Sánchez fca154d1e0 Add acceptance tests for folders that can not be reshared
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-23 15:14:48 +01:00
Daniel Calviño Sánchez 708e40e303 Add acceptance tests for resharing a folder with another user
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-23 15:14:48 +01:00
Daniel Calviño Sánchez 792863ed10 Add acceptance test for checking that the owner can see reshares
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-23 15:14:48 +01:00
Daniel Calviño Sánchez fd4e10e056 Add acceptance test for resharing a file with another user
To reshare a file there must be at least three enabled users in the
system; although it would be possible to run the steps to create a third
user in the scenarios that need it for convenience a third enabled user
besides "admin" and "user0" was added to the default setup.

In a similar way, a new step was added too to login as a given user
name, similar to the steps to log in as "user0" and as "admin".

Finally, another actor, "Jim", was introduced for those scenarios which
should be played by three standard actors (that is, without a special
configuration like "Rubeus").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-23 15:14:48 +01:00
Daniel Calviño Sánchez 2a27481e2f Add acceptance tests for sharing a folder with another user
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-23 15:14:48 +01:00
Daniel Calviño Sánchez 971c548256 Add acceptance tests for sharing a file with another user
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-23 15:14:43 +01:00
Morris Jobke c6232291a0
Merge pull request #12598 from nextcloud/stable14-12577-fix-rendering-of-the-sidebar-in-files-app
[stable14] Fix rendering of the sidebar in Files app
2018-11-23 08:51:22 +01:00
Morris Jobke b289150700
Merge pull request #12560 from nextcloud/stb14-share-menu-click-fix
[stable14] Fix share link password input
2018-11-23 08:46:07 +01:00
Morris Jobke e1873e8928
Merge pull request #12593 from nextcloud/backport/12554/stable14
[stable14] Do not switch to root folder if filelist is already shown
2018-11-23 08:44:02 +01:00
Nextcloud bot d655567672
[tx-robot] updated from transifex 2018-11-23 01:13:19 +00:00
Morris Jobke 77c87b1b23
Merge pull request #12596 from nextcloud/backport/12448/stable14
[stable14] Load apps that have a dav type set before the dav server plugins
2018-11-22 23:43:55 +01:00
Georg Ehrke 92b264cc09 RoomManager/ResourceManager: Inject IServerContainer instead of using OC Server
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-22 22:41:29 +00:00
Georg Ehrke b0d17266e4 adjust Calendar resource / room interfaces to use class implementation
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-22 22:41:28 +00:00
John Molakvoæ (skjnldsv) d8a8c03c36
Fix share link password input
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-22 21:59:23 +01:00
Roeland Jago Douma 55c4d3f555
Merge pull request #12600 from nextcloud/backport/12592/stable14
[stable14] Fix Typo in Original English String and All Translations
2018-11-22 20:16:42 +01:00
Patrick Baber 49c8512f59 fix typo in original english string and all translations
Signed-off-by: Patrick Baber <patrick@p-squared.de>
2018-11-22 18:22:56 +00:00
Daniel Calviño Sánchez e3d90efdbb Fix rendering of the sidebar in Files app
When a view is rendered it should not be concerned with where it is
going to be placed in the document; in general this should be a
responsibility of the object using the view.

Moreover, when the details view is rendered it should simply prepare a
skeleton that includes the root elements provided by the plugins; those
elements will be updated by the plugins as needed when a file or a tab
is selected.

Finally, the details view should not be explicitly rendered. The
rendering removes the previous elements, but that is needed only when
the details view is in a dirty state, that is, when new plugins were
added since the last time that it was rendered. However, that dirty
state is internally handled, and the view is automatically rendered
again if needed when a file info is set.

Due to all that the details view is no longer explicitly rendered when
updating it with a different file. Also, as each file list has its own
details view, and each details view has its own element, but there can
be only one details view/sidebar element in the document, when the file
list updates the details view it also replaces the current one in the
document with its own details view if needed (that is, if it is not the
current one already).

Besides that, when the element of a details view is replaced with the
element of a different details view the old one should be detached from
the document, but never removed. Otherwise the event handlers would not
work when that element is attached again later (when changing to a
different section in the Files app and then going back to the previous
one).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-22 17:45:46 +01:00
Daniel Calviño Sánchez 2d58826d42 Add acceptance tests for showing again the input field for tags
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-22 17:43:58 +01:00
Daniel Calviño Sánchez f9efd31623 Add acceptance tests for opening and closing again the details view
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-22 17:43:58 +01:00
Daniel Calviño Sánchez 400d42a47a Add acceptance tests for marking a file as favorite in the details view
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-22 17:43:58 +01:00
Daniel Calviño Sánchez d0ea4ad8b8 Add acceptance tests for switching to the comments of another file
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-22 17:43:58 +01:00
Julius Härtl a584406947 Load apps that have a dav type set before the dav server plugins
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-22 16:26:14 +00:00
Julius Härtl 07c5c686a0 Do not switch to root folder if filelist is already shown
Navigating to the root folder is already handled by
OCA.Files.Navigation.setActiveItem in case the view doesn't change.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-22 15:10:53 +00:00
Morris Jobke ff59905b12
Merge pull request #12540 from nextcloud/backport/12450/stable14
[stable14] Throw exception if decryption fails
2018-11-22 14:54:02 +01:00
Morris Jobke 47b9e5d08c
Merge pull request #12555 from nextcloud/backport/12552/stable14
[stable14] Respect the disabled setting for lost_password_link
2018-11-22 14:53:46 +01:00
Morris Jobke d25e8a774a
Merge pull request #12586 from nextcloud/version/noid/14.0.4
14.0.4
2018-11-22 14:14:28 +01:00
Morris Jobke 99646e1976
14.0.4
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-22 11:05:37 +01:00
Nextcloud bot 7d6aea2e54
[tx-robot] updated from transifex 2018-11-22 01:12:30 +00:00
Roeland Jago Douma 4044ac3b71
Merge pull request #12561 from nextcloud/backport/12544/stable14
[14] Handle permission in update of share better
2018-11-21 08:58:02 +01:00
Nextcloud bot 3593764e1b
[tx-robot] updated from transifex 2018-11-21 01:12:26 +00:00
Roeland Jago Douma e07db91900
Merge pull request #12545 from nextcloud/backport/12543/stable14
[stable14] Bearer tokens are app token
2018-11-20 20:06:39 +01:00
Roeland Jago Douma 395d697598
Handle permission in update of share better
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-20 19:36:17 +01:00
Roeland Jago Douma b776c3b89f Respect the disabled setting for lost_password_link
Fixes #11146
As documented when it is set to disabled the user can't request a lost
password.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-20 14:53:19 +00:00
Roeland Jago Douma adf1488e4e Bearer tokens are app token
Fixes #12498

This means that we set that it is a proper app token once it is
validated. This will allow the 2FA middleware to just run the same
check.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-20 10:50:21 +00:00
Morris Jobke b4a410e502
Merge pull request #12533 from nextcloud/version/noid/14.0.4rc2
14.0.4 RC 2
2018-11-20 10:17:01 +01:00