Commit Graph

53230 Commits

Author SHA1 Message Date
Roeland Jago Douma fc2e17d33f
Merge pull request #20246 from nextcloud/fix/untranslated_mail_footer
Provide the proper language to the mailer
2020-04-16 10:06:55 +02:00
Roeland Jago Douma bb4dedb015
Provide the proper language to the mailer
Else we can't properly translate the footer in the recipients e-mail
language.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-16 09:04:13 +02:00
Roeland Jago Douma 1f2df2f6bc
Merge pull request #20506 from nextcloud/version/19/beta4
19 beta 4
2020-04-16 08:47:20 +02:00
Roeland Jago Douma e21d65e771
Merge pull request #20509 from nextcloud/revert-20050-bugfix/noid/mysql-equal-trims-shock
Revert "Make sure MySQL is not saying 'this' = 'this ' is true"
2020-04-16 08:46:18 +02:00
Nextcloud bot 078ac97939
[tx-robot] updated from transifex 2020-04-16 02:17:30 +00:00
Roeland Jago Douma cbcf072b23
Revert "Make sure MySQL is not saying 'this' = 'this ' is true" 2020-04-15 23:49:16 +02:00
Roeland Jago Douma 2e36ea010a
19 beta 4
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-15 21:54:55 +02:00
blizzz 48a8f0a464
Merge pull request #20503 from nextcloud/fix/noid/dav-catch-throwable
DAV's exception logger should deal with any Throwable
2020-04-15 21:48:35 +02:00
Roeland Jago Douma 0571fd3635
Merge pull request #20386 from nextcloud/version/19/beta3
19 beta 3
2020-04-15 21:47:21 +02:00
Christoph Wurst 3aa8849b7d
Merge pull request #20501 from nextcloud/fix/noid/run-cs-fix
Run cs:fix and fix HashWrapper code
2020-04-15 21:37:46 +02:00
Christoph Wurst 018a2917c1
Merge pull request #20502 from nextcloud/techdebt/cs-check-diff
Print diff in cs:check command
2020-04-15 18:30:28 +02:00
Arthur Schiwon 73271aa086
DAV's exception logger should deal with any Throwable
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-04-15 15:28:37 +02:00
blizzz 8bc381f104
Merge pull request #20037 from nextcloud/fix/19127/deprecated-ldap_control_paged_result_1
do not use deprecated API for LDAP paged results
2020-04-15 15:02:51 +02:00
Christoph Wurst 0b652d543b
Print diff in cs:check command
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-15 14:36:14 +02:00
Morris Jobke 7fe8477830
Run cs:fix and fix HashWrapper code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-04-15 14:08:56 +02:00
Morris Jobke c914ae4c8d
Merge pull request #20500 from nextcloud/update-editor-config
Update editor config for .yml files
2020-04-15 14:07:08 +02:00
Morris Jobke d8557d0d8a
Merge pull request #19540 from jlutran/fixKeystoneV3Auth
Fix issues with Keystone auth v3 in files_external app
2020-04-15 14:05:32 +02:00
Joas Schilling 058ca8c560
Update editor config for .yml files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-15 13:47:33 +02:00
Christoph Wurst 51fc07be3d
Merge pull request #20481 from ACTom/add-mindmap-mimetype
Add mindmap mimetype.
2020-04-15 13:39:35 +02:00
Morris Jobke c43174a7e6
Merge pull request #20050 from nextcloud/bugfix/noid/mysql-equal-trims-shock
Make sure MySQL is not saying 'this' = 'this ' is true
2020-04-15 12:57:27 +02:00
Joas Schilling 5c0637bc90
Merge pull request #20138 from nextcloud/bugfix/noid/make-remote-checking-more-generic
Make remote checking more generic
2020-04-15 12:48:49 +02:00
Roeland Jago Douma 95ad9ab4ac
Merge pull request #20401 from nextcloud/fix/login-sso-redirct
Fix absolute redirect
2020-04-15 11:28:40 +02:00
Roeland Jago Douma 19171d77e2
Merge pull request #19191 from laurisb/patch-1
Improve Opcache detection
2020-04-15 11:03:05 +02:00
Christoph Wurst 301327135c
Merge pull request #20361 from nextcloud/write-stream-close-on-exception
Close the streams in `writeStream` even when there is an exception
2020-04-15 10:48:24 +02:00
Julien Lutran 3e849daf11
Fix issues with Keystone auth v3 in files_external app
Signed-off-by: Julien Lutran <julien.lutran@corp.ovh.com>
2020-04-15 10:33:08 +02:00
Roeland Jago Douma d63abebc93
Merge pull request #19351 from nextcloud/dav-upload-hash
Return hashes of uploaded content for dav uploads
2020-04-15 10:23:22 +02:00
Joas Schilling 16e9bf2309
Make sure MySQL is not saying 'this' = 'this ' is true
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-15 09:14:12 +02:00
Roeland Jago Douma b212151af1
Merge pull request #20476 from nextcloud/techdebt/php-cs-check-action
Add php-cs check action
2020-04-15 08:30:29 +02:00
Joas Schilling 4e846dda4d
Allow local remotes in integration tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-15 08:24:18 +02:00
Joas Schilling fd0c1a3bb2
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-15 08:06:51 +02:00
Nextcloud bot bccd13ffae
[tx-robot] updated from transifex 2020-04-15 02:17:12 +00:00
Christoph Wurst 9e6fcd585b
Show a hint for the php-cs fix when the check fails
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-14 22:11:41 +02:00
Joas Schilling 7c53f0ed22
Merge pull request #20474 from nextcloud/update-crl
Update root.crl due to revocation of spgverein.crt
2020-04-14 20:38:31 +02:00
Joas Schilling 0bd7382a44
Merge pull request #19936 from nextcloud/bugfix/noid/handle-unset-owner-in-sharing
Handle unset owner in sharing
2020-04-14 20:34:17 +02:00
ACTom efb3481d41
Add mindmap mimetype.
Signed-off-by: ACTom <i@actom.me>
2020-04-15 01:19:58 +08:00
Joas Schilling cde6d768de
Merge pull request #20181 from nextcloud/bugfix/noid/dont-break-on-path-null
Also bail out when the path is actually null
2020-04-14 18:56:58 +02:00
Joas Schilling 609b8aff12
Also disallow ; in remote urls
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-14 18:56:06 +02:00
Joas Schilling 5e402f8aae
Check all remotes for local access
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-14 18:56:06 +02:00
Christoph Wurst 833d1d2c3b
Fix php-cs formatting
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-14 17:53:44 +02:00
Christoph Wurst c9980ed099
Add php-cs check action
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-14 17:44:08 +02:00
Roeland Jago Douma d7a74d0e35
Merge pull request #20472 from nextcloud/fix/19848/make-sure-destination-is-not-a-directory
Verify that destination is not a directory.
2020-04-14 15:20:46 +02:00
Morris Jobke d702c3d788
Update root.crl due to revocation of spgverein.crt
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-04-14 14:37:05 +02:00
John Molakvoæ a5c186beb0
Merge pull request #20470 from nextcloud/fix/noid/karma-coverage
Fix jsunit tests
2020-04-14 14:35:57 +02:00
Arthur Schiwon 84619a5b9c
use serverControls directly with LDAP calls, fixes 19127
- adapters for PHP API version to Support PHP < 7.3
- switch to pass only one base per search
- cookie logic is moved from Access to API adapters

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-04-14 12:58:28 +02:00
Daniel Kesselberg 91ab811824
Verify that destination is not a directory.
Otherwise file_put_contents will fail later.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-04-14 12:52:12 +02:00
Daniel Kesselberg 0ccaec9841
Fix jsunit tests
JSUnit tests are failing for some reason. It seems to be related to a new karma-coverage version published a few hours ago.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-04-14 11:55:12 +02:00
John Molakvoæ e4d378d01e
Merge pull request #20469 from nextcloud/fix/sidebar/sharing/password-error-message
Properly display share error messages
2020-04-14 11:25:50 +02:00
John Molakvoæ (skjnldsv) 47146a1992 Properly display share error messages
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-04-14 08:39:40 +00:00
Nextcloud bot 09bb8ac6e2
[tx-robot] updated from transifex 2020-04-14 02:16:50 +00:00
Roeland Jago Douma 92692cdd7a
Merge pull request #20444 from nextcloud/dependabot/npm_and_yarn/url-loader-4.1.0
Bump url-loader from 4.0.0 to 4.1.0
2020-04-13 20:16:15 +02:00