summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20503 from nextcloud/fix/noid/dav-catch-throwableblizzz2020-04-151-1/+1
|\ | | | | DAV's exception logger should deal with any Throwable
| * DAV's exception logger should deal with any ThrowableArthur Schiwon2020-04-151-1/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #20386 from nextcloud/version/19/beta3v19.0.0beta3Roeland Jago Douma2020-04-151-2/+2
|\ \ | | | | | | 19 beta 3
| * | 19 beta 3Roeland Jago Douma2020-04-091-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #20501 from nextcloud/fix/noid/run-cs-fixChristoph Wurst2020-04-152-2/+6
|\ \ \ | | | | | | | | Run cs:fix and fix HashWrapper code
| * | | Run cs:fix and fix HashWrapper codeMorris Jobke2020-04-152-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #20502 from nextcloud/techdebt/cs-check-diffChristoph Wurst2020-04-151-1/+1
|\ \ \ \ | |_|_|/ |/| | | Print diff in cs:check command
| * | | Print diff in cs:check commandChristoph Wurst2020-04-151-1/+1
| |/ / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #20037 from ↵blizzz2020-04-1516-227/+749
|\ \ \ | |/ / |/| | | | | | | | nextcloud/fix/19127/deprecated-ldap_control_paged_result_1 do not use deprecated API for LDAP paged results
| * | use serverControls directly with LDAP calls, fixes 19127Arthur Schiwon2020-04-1416-227/+749
| | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | Merge pull request #20500 from nextcloud/update-editor-configMorris Jobke2020-04-151-0/+4
|\ \ \ | | | | | | | | Update editor config for .yml files
| * | | Update editor config for .yml filesJoas Schilling2020-04-151-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #19540 from jlutran/fixKeystoneV3AuthMorris Jobke2020-04-153-2/+6
|\ \ \ \ | |/ / / |/| | | Fix issues with Keystone auth v3 in files_external app
| * | | Fix issues with Keystone auth v3 in files_external appJulien Lutran2020-04-153-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Julien Lutran <julien.lutran@corp.ovh.com>
* | | | Merge pull request #20481 from ACTom/add-mindmap-mimetypeChristoph Wurst2020-04-153-2/+12
|\ \ \ \ | | | | | | | | | | Add mindmap mimetype.
| * | | | Add mindmap mimetype.ACTom2020-04-153-2/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: ACTom <i@actom.me>
* | | | | Merge pull request #20050 from nextcloud/bugfix/noid/mysql-equal-trims-shockMorris Jobke2020-04-152-1/+9
|\ \ \ \ \ | | | | | | | | | | | | Make sure MySQL is not saying 'this' = 'this ' is true
| * | | | | Make sure MySQL is not saying 'this' = 'this ' is trueJoas Schilling2020-04-152-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #20138 from ↵Joas Schilling2020-04-1514-65/+300
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/make-remote-checking-more-generic Make remote checking more generic
| * | | | | | Allow local remotes in integration testsJoas Schilling2020-04-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Fix unit testsJoas Schilling2020-04-152-7/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Also disallow ; in remote urlsJoas Schilling2020-04-142-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Check all remotes for local accessJoas Schilling2020-04-149-57/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #20401 from nextcloud/fix/login-sso-redirctRoeland Jago Douma2020-04-152-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix absolute redirect
| * | | | | | | Fix absolute redirectJohn Molakvoæ (skjnldsv)2020-04-102-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | Merge pull request #19191 from laurisb/patch-1Roeland Jago Douma2020-04-151-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve Opcache detection
| * | | | | | | | Improve Opcache detectionLauris Binde2020-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Opcache detection by checking if extension is loaded, as opcache_get_status() is commonly disabled on shared hosting servers
* | | | | | | | | Merge pull request #20361 from nextcloud/write-stream-close-on-exceptionChristoph Wurst2020-04-151-3/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | Close the streams in `writeStream` even when there is an exception
| * | | | | | | | Close the streams in `writeStream` even when there is an exceptionRobin Appelman2020-04-081-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | Merge pull request #19351 from nextcloud/dav-upload-hashRoeland Jago Douma2020-04-155-9/+151
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Return hashes of uploaded content for dav uploads
| * | | | | | | | dont set headers for cliRobin Appelman2020-04-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | | Return hashes of uploaded content for dav uploadsRobin Appelman2020-04-135-8/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashes are set in "X-Hash-MD5", "X-Hash-SHA1" and "X-Hash-SHA256" headers. these headers are set for file uploads and the MOVE request at the end of a multipart upload. Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | Merge pull request #20476 from nextcloud/techdebt/php-cs-check-actionRoeland Jago Douma2020-04-152-1/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add php-cs check action
| * | | | | | | | | Show a hint for the php-cs fix when the check failsChristoph Wurst2020-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | | | | Fix php-cs formattingChristoph Wurst2020-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | | | | Add php-cs check actionChristoph Wurst2020-04-141-0/+16
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2020-04-1530-14/+98
| | | | | | | | |
* | | | | | | | | Merge pull request #20474 from nextcloud/update-crlJoas Schilling2020-04-141-17/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update root.crl due to revocation of spgverein.crt
| * | | | | | | | | Update root.crl due to revocation of spgverein.crtMorris Jobke2020-04-141-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | | Merge pull request #19936 from ↵Joas Schilling2020-04-141-2/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/handle-unset-owner-in-sharing Handle unset owner in sharing
| * | | | | | | | | | Handle unset owner in sharingJoas Schilling2020-03-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | | | Merge pull request #20181 from nextcloud/bugfix/noid/dont-break-on-path-nullJoas Schilling2020-04-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | Also bail out when the path is actually null
| * | | | | | | | | | Also bail out when the path is actually nullJoas Schilling2020-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently this can happen when a external mount was shared that is later not available anymore Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | | | Merge pull request #20472 from ↵Roeland Jago Douma2020-04-142-4/+54
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/19848/make-sure-destination-is-not-a-directory Verify that destination is not a directory.
| * | | | | | | | | | Verify that destination is not a directory.Daniel Kesselberg2020-04-142-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise file_put_contents will fail later. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | | | | Merge pull request #20470 from nextcloud/fix/noid/karma-coverageJohn Molakvoæ2020-04-143-90/+390
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Fix jsunit tests
| * | | | | | | | | | Fix jsunit testsDaniel Kesselberg2020-04-143-90/+390
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | Merge pull request #20469 from ↵John Molakvoæ2020-04-143-4/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/sidebar/sharing/password-error-message Properly display share error messages
| * | | | | | | | | Properly display share error messagesJohn Molakvoæ (skjnldsv)2020-04-143-4/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2020-04-146-4/+16
| | | | | | | | |