upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27
52734 commits 985 branches 1211 tags 9.7 GiB
Commit graph

21982 commits

Author SHA1 Message Date
Roeland Jago Douma
0a79de3652
Merge pull request #21211 from nextcloud/backport/20938/stable18 
[stable18] Fix the Talk verification
 2020-06-06 09:33:37 +02:00
Nextcloud bot
b07978f18e
[tx-robot] updated from transifex 2020-06-06 02:16:17 +00:00
Thomas Citharel
bff012a2b2 Fix empty event UUID reminder notifications 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-05 07:07:51 +00:00
Nextcloud bot
d1f40575f9
[tx-robot] updated from transifex 2020-06-05 02:16:55 +00:00
Thomas Citharel
b210ed6990
Use \OC::$CLI instead of PHP_SAPI 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-04 11:34:33 +02:00
Thomas Citharel
6c2cde3d0c
Fix password reset saying Admin changed my password when reset from 
login page

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-04 11:16:39 +02:00
Roeland Jago Douma
857b09e068
Merge pull request #21201 from nextcloud/backport/21181/stable18 
[stable18] Do not only catch Exceptions but any Throwable during rmt share delete
 2020-06-04 10:59:26 +02:00
Nextcloud bot
d1e606aebd
[tx-robot] updated from transifex 2020-06-04 02:16:35 +00:00
Daniel Calviño Sánchez
1d7cc2e356 Restore previous state when failing to change video verification state 
When video verification can not be enabled or disabled the previous
state is set again in the JavaScript share object. This ensures that the
UI will not reflect a misleading state.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-06-03 14:18:33 +00:00
Christoph Wurst
d41e5778a0 Fix the Talk verification 
When enabling or disabling Talk verification in mail shares the server
expects also a new password to be set. As we always just update one
property at a time this means the Talk verification was impossible to
activate or deactivate. With this patch, we send the talk option AND the
new password. If there is no new password, the Talk option is disabled
(in mail shares; in link shares it is possible to enable or disable the
video verification without changing the password).

When we finally have descriptive text on ActionCheckbox'es we should
definitely add some explanatory text for the user. Right now this is as
good as it gets.

We'll have to backport to 18.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-06-03 13:55:35 +00:00
Christoph Wurst
fab0888fb2 Do not only catch Exceptions but any Throwable during rmt share delete 
When a remote share is deleted, we notify the remove instance. This may
trigger various error conditions, which we want to catch in order to
avoid undeletable shares. The try-catch, however, did only capture
exceptions, so things like TypeErrors were not caught and caused the
process to fail hard.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-06-03 09:15:55 +00:00
Nextcloud bot
7e8803ba9f
[tx-robot] updated from transifex 2020-06-03 02:16:28 +00:00
Nextcloud bot
db16e67e05
[tx-robot] updated from transifex 2020-06-02 02:16:11 +00:00
Nextcloud bot
802de535c6
[tx-robot] updated from transifex 2020-06-01 02:16:10 +00:00
Nextcloud bot
bdff0fad1f
[tx-robot] updated from transifex 2020-05-31 02:16:28 +00:00
Nextcloud bot
556a9e88f0
[tx-robot] updated from transifex 2020-05-30 02:16:15 +00:00
Morris Jobke
555108dc65
Revert "[stable18] Fix password changes in link and mail shares" 2020-05-29 21:35:57 +02:00
Daniel Calviño Sánchez
149d2b0013 Fix creating a mail share with a password 
When a mail share was created with a password the given password was not
hashed, so it was not possible to open the share with that password.
Moreover, if passwords were enforced the given password was ignored and
a new one was set (although in this case it was hashed so it worked as
expected). Now the given password is properly hashed and not overriden.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-05-29 14:42:16 +02:00
Daniel Calviño Sánchez
ff810f8e23 Extend mail shares unit tests to check the password and mail template 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-05-29 14:42:16 +02:00
Nextcloud bot
bb107a1f6f
[tx-robot] updated from transifex 2020-05-29 02:16:39 +00:00
Roeland Jago Douma
876479799e
Merge pull request #21109 from nextcloud/backport/19793/stable18 
[stable18] Fix resharing of federated shares that were created out of links
 2020-05-28 16:37:28 +02:00
Christoph Wurst
852b0ba19d
Merge pull request #21127 from nextcloud/fix/make-translation-sanitization-optional-stable18 
[stable18] Make the translation sanitization optional
 2020-05-28 09:20:03 +02:00
Nextcloud bot
8718e0776d
[tx-robot] updated from transifex 2020-05-28 02:16:48 +00:00
Christoph Wurst
e2bc5ae74e
Fix devices & sessions sanitization 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-05-27 16:17:21 +02:00
blizzz
c7c7433f11 Merge pull request #21115 from nextcloud/backport/21106/stable18 
[stable18] use the loginname to verify the old password in user password changes
 2020-05-27 10:18:58 +02:00
Nextcloud bot
fdb58f1852
[tx-robot] updated from transifex 2020-05-27 02:16:21 +00:00
Arthur Schiwon
292d8c3d9c use the loginname to verify the old password in user password changes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-05-26 19:22:33 +00:00
John Molakvoæ (skjnldsv)
9d422a2d9a
Fix federated link sharing permissions 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-05-26 11:30:09 +02:00
Julius Härtl
9a1275b5b9
Fix share update test 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-05-26 11:28:42 +02:00
Roeland Jago Douma
04b02572c3
Have share permissions on link shares if it is enabled 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-26 11:28:42 +02:00
Julius Härtl
4a2ded0199
Link shares have reshare permission if outgoing federated shares are enabled 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-05-26 11:28:42 +02:00
Julius Härtl
5b74da3a87
Set proper share type when converting link shares to federated shares 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-05-26 11:28:41 +02:00
Nextcloud bot
17183f0aac
[tx-robot] updated from transifex 2020-05-26 02:16:13 +00:00
Morris Jobke
de1cbad0ee
Merge pull request #20881 from nextcloud/backport/20841/stable18 
[stable18] add locking to resolve concurent move to trashbin conflicts
 2020-05-25 21:31:36 +02:00
Nextcloud bot
4e8f72726a
[tx-robot] updated from transifex 2020-05-25 02:16:31 +00:00
Nextcloud bot
f6372e3cb6
[tx-robot] updated from transifex 2020-05-24 02:16:04 +00:00
Nextcloud bot
120a7a7e23
[tx-robot] updated from transifex 2020-05-23 02:16:31 +00:00
Nextcloud bot
588fa72207
[tx-robot] updated from transifex 2020-05-22 02:17:31 +00:00
Nextcloud bot
8529fbae9b
[tx-robot] updated from transifex 2020-05-21 02:17:37 +00:00
Nextcloud bot
d6fa810331
[tx-robot] updated from transifex 2020-05-20 02:16:38 +00:00
Nextcloud bot
6090c75d90
[tx-robot] updated from transifex 2020-05-19 02:17:20 +00:00
Roeland Jago Douma
f633336904
Merge pull request #20996 from nextcloud/backport/20629/stable18 
[stable18] Don't load text file preview when text app is available (Fixes: #20615)
 2020-05-18 12:30:13 +02:00
Morris Jobke
883e519608
Merge pull request #20994 from nextcloud/backport/19540/stable18 
[stable18] Fix issues with Keystone auth v3 in files_external app
 2020-05-18 11:52:12 +02:00
Morris Jobke
9033d57e39
Merge pull request #20992 from nextcloud/backport/20941/stable18 
[stable18] update icewind/smb to 3.2.4
 2020-05-18 11:03:54 +02:00
Nextcloud bot
fd4bf6fa50
[tx-robot] updated from transifex 2020-05-18 02:16:32 +00:00
Nextcloud bot
ecbd06cb6b
[tx-robot] updated from transifex 2020-05-17 02:17:08 +00:00
Nextcloud bot
02ccec2298
[tx-robot] updated from transifex 2020-05-16 02:17:24 +00:00
Jonas Meurer
d2396de9db Don't load text file preview when text app is available (Fixes: #20615) 
When opening a shared text document, the files_sharing app uses
internal preview support in case no other app to open the text file is
available.

So far, it only checks for the old files_texteditor app, not for the new
new text app. This commit fixes this by checking for both.

Signed-off-by: Jonas Meurer <jonas@freesources.org>
 2020-05-15 17:48:57 +00:00
Robin Appelman
5d38e80cf0
update icewind/smb to 3.2.4 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-05-15 17:21:00 +02:00
Julien Lutran
1a990b9487 Fix issues with Keystone auth v3 in files_external app 
Signed-off-by: Julien Lutran <julien.lutran@corp.ovh.com>
 2020-05-15 15:19:36 +00:00