upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20
46971 commits 1042 branches 1221 tags 8.4 GiB
Commit graph

46971 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Kraume
604cbb62ec Set Referrer-Policy also in addSecurityHeaders() 
Fix: #12689
Signed-off-by: Peter Kraume <peter.kraume@gmx.de>
 2018-11-29 16:48:06 +00:00
John Molakvoæ
ea310cbfdf
Merge pull request #12718 from nextcloud/backport/12668/stable15 
[stable15] add capabilities for multiple share links
 2018-11-29 10:09:13 +01:00
Nextcloud bot
be1b653ede
[tx-robot] updated from transifex 2018-11-29 01:11:44 +00:00
Morris Jobke
68d24c829a
Merge pull request #12712 from nextcloud/backport/12698/stable15 
[stable15] I changed the width of the srollbar to make it a bit bigger
 2018-11-28 23:06:29 +01:00
Morris Jobke
33cf14a492
Merge pull request #12713 from nextcloud/backport/12677/stable15 
[stable15] Open the updater via a POST form submit instead of eval the JS code d…
 2018-11-28 23:05:17 +01:00
Bjoern Schiessle
46eca11a21 add capabilities for multiple share links 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-28 21:07:16 +00:00
Roeland Jago Douma
c0a8e5b208
Merge pull request #12714 from nextcloud/backport/12708/stable15 
[stable15] Fix folder path containing leading slash when getting mount root by id
 2018-11-28 22:02:10 +01:00
Robin Appelman
9ee94afe7e Fix folder path containing leading slash when getting mount root by id 
This fixes collabora on public link shared groupfolders

Fixes https://github.com/nextcloud/groupfolders/issues/225

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-28 19:07:11 +00:00
Morris Jobke
6ac882f422
Open the updater via a POST form submit instead of eval the JS code directly 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-28 20:04:12 +01:00
GretaD
57aa26d814 I changed the width of the srollbar to make it a bit bigger 
Signed-off-by: GretaD <gretadoci@gmail.com>
 2018-11-28 18:39:04 +00:00
Daniel Kesselberg
a027d55efc
Merge pull request #12700 from nextcloud/backport/12632/stable15 
[stable15] Add acceptance tests for sharing files and folders with another user
 2018-11-28 14:12:14 +01:00
Nextcloud bot
7bdfc0c3df
[tx-robot] updated from transifex 2018-11-28 01:12:05 +00:00
Daniel Calviño Sánchez
c6ca6b03eb 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-27 21:08:59 +00:00
Daniel Calviño Sánchez
9354de01bb 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-27 21:08:58 +00:00
Daniel Calviño Sánchez
65192469c8 Extract sharing related acceptance tests to their own feature files 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-27 21:08:58 +00:00
Daniel Calviño Sánchez
39e5493072 Add acceptance tests for folders that can not be reshared 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-27 21:08:58 +00:00
Daniel Calviño Sánchez
41fff0932c Add acceptance tests for resharing a folder with another user 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-27 21:08:58 +00:00
Daniel Calviño Sánchez
e435574613 Add acceptance test for checking that the owner can see reshares 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-27 21:08:58 +00:00
Daniel Calviño Sánchez
976fa8487f 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-27 21:08:58 +00:00
Daniel Calviño Sánchez
aa19e89645 Add acceptance tests for sharing a folder with another user 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-27 21:08:58 +00:00
Daniel Calviño Sánchez
6ca82176a4 Add acceptance tests for sharing a file with another user 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-27 21:08:58 +00:00
Daniel Kesselberg
5ea9932b59
Merge pull request #12696 from nextcloud/backport/12649/stable15 
[stable15] Make acceptance tests for comments more robust
 2018-11-27 22:00:21 +01:00
Daniel Calviño Sánchez
ad0adaea95 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:55:32 +00:00
Daniel Calviño Sánchez
4c88b12a28 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:55:32 +00:00
Roeland Jago Douma
b7e195dd7f
Merge pull request #12683 from nextcloud/backport/12650/stable15 
[stable15] Fix count on string
 2018-11-27 16:28:25 +01:00
Daniel Kesselberg
d0f341b355 Add return type 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-27 13:16:26 +00:00
Daniel Kesselberg
943f2576c5 Fix count on string 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-27 13:16:26 +00:00
Nextcloud bot
a2dd8d05b1
[tx-robot] updated from transifex 2018-11-27 01:11:43 +00:00
Morris Jobke
ca7c56116f
Merge pull request #12638 from nextcloud/backport/12556/stable15 
[stable15] extend anonymous options to work on every dav url
 2018-11-26 11:03:12 +01:00
Nextcloud bot
d2137ff778
[tx-robot] updated from transifex 2018-11-26 01:11:31 +00:00
Nextcloud bot
9dcde5912b
[tx-robot] updated from transifex 2018-11-25 01:12:25 +00:00
Nextcloud bot
a9a457e542
[tx-robot] updated from transifex 2018-11-24 01:11:28 +00:00
Robin Appelman
38e115e5bf extend anonymous options to work on every dav url 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-23 18:05:03 +00:00
Roeland Jago Douma
a1ca70bbed
Merge pull request #12615 from nextcloud/backport/12592/stable15 
[stable15] Fix Typo in Original English String and All Translations
 2018-11-23 07:48:33 +01:00
Nextcloud bot
72b4cce30b
[tx-robot] updated from transifex 2018-11-23 01:13:08 +00:00
Patrick Baber
9d3553261c fix typo in original english string and all translations 
Signed-off-by: Patrick Baber <patrick@p-squared.de>
 2018-11-22 22:35:13 +00:00
Morris Jobke
510f720778
Merge pull request #12581 from nextcloud/version/noid/15.0.0rc1 
15.0.0 RC 1
 2018-11-22 16:59:14 +01:00
Morris Jobke
c3c626a75e
15.0.0 RC 1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-22 16:23:24 +01:00
Morris Jobke
2e52ea5ad4
Merge pull request #12554 from nextcloud/bugfix/12493/root-folder-switch 
Do not switch to root folder if filelist is already shown
 2018-11-22 16:09:56 +01:00
Morris Jobke
e0967ffd3a
Merge pull request #12587 from nextcloud/new-user-clear-fix 
Do not clear new user form on failure
 2018-11-22 14:39:27 +01:00
Julius Härtl
a90b4bcc32
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 14:03:23 +01:00
John Molakvoæ (skjnldsv)
b28c42506f
Do not clear new user form on failure 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-22 13:58:15 +01:00
Morris Jobke
ad1a026e54
Merge pull request #12589 from nextcloud/fix/twofactor-admin-groups-explanation 
Add explanatory text to admin twofactor settings
 2018-11-22 13:50:11 +01:00
Morris Jobke
db6fad3eee
Merge pull request #12571 from TheLastProject/feature/make_connectivity_check_domains_changeable 
Make connectivity check domains configurable
 2018-11-22 13:42:54 +01:00
Christoph Wurst
c95ef8534e
Add explanatory text to admin twofactor settings 
Ref #12249
Ref https://github.com/nextcloud/documentation/pull/937

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-11-22 12:01:45 +01:00
Morris Jobke
e8df902083
Merge pull request #12580 from nextcloud/app-navigation-menu-dark-fix 
Fix navigation more menu background for dark theme
 2018-11-22 11:21:58 +01:00
Morris Jobke
0534bcfb6a
Merge pull request #12485 from nextcloud/nextcloud-talk-sessions-format 
Format Nextcloud Talk clients sessions.
 2018-11-22 11:15:49 +01:00
Sylvia van Os
935bb25639 Make connectivity check domains configurable 
Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
 2018-11-22 10:57:16 +01:00
Morris Jobke
ede53e06c1
Merge pull request #12553 from nextcloud/bugfix/noid/allow-empty-string-in-getAbsoluteURL 
Allow empty string in get absolute url
 2018-11-22 10:26:23 +01:00
Morris Jobke
2e68b73e5e
Merge pull request #12558 from nextcloud/blurry-button 
Apply border to primary button if on log in page (and not in a dark container) or if in header
 2018-11-22 10:18:52 +01:00