summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22768 from nextcloud/fix/22288/change-0-to-null-for-bmp-e...Morris Jobke2020-09-101-1/+1
|\
| * Change 0 to null to properly encode image to BMP if the first pixel is blackMorris Jobke2020-09-101-1/+1
* | Merge pull request #22739 from nextcloud/bugfix/16989Morris Jobke2020-09-102-2/+12
|\ \
| * | Annotate that writeStream can throw a GenericFileExceptionJulius Härtl2020-09-101-0/+3
| * | Properly catch exception from writing to stream when copying a fileJulius Härtl2020-09-101-2/+9
* | | Merge pull request #22773 from nextcloud/revert-22614-fix/22606/popover-bound...Joas Schilling2020-09-101-1/+1
|\ \ \
| * | | Revert "Increase html body height to full content height"Joas Schilling2020-09-101-1/+1
* | | | Merge pull request #22672 from nextcloud/dependabot/npm_and_yarn/v-click-outs...Roeland Jago Douma2020-09-1028-36/+36
|\ \ \ \ | |/ / / |/| | |
| * | | Compile assetsnpmbuildbot[bot]2020-09-1026-32/+32
| * | | Bump v-click-outside from 3.1.0 to 3.1.1dependabot[bot]2020-09-102-4/+4
* | | | Merge pull request #22665 from nextcloud/dependabot/composer/build/integratio...Morris Jobke2020-09-101-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Update behat/behat requirement in /build/integrationdependabot[bot]2020-09-081-1/+1
* | | | Merge pull request #22687 from nextcloud/dependabot/npm_and_yarn/query-string...Morris Jobke2020-09-104-12/+18
|\ \ \ \
| * | | | Bump query-string from 5.1.1 to 6.13.1dependabot[bot]2020-09-084-12/+18
| |/ / /
* | | | Merge pull request #22747 from nextcloud/s3-isdir-emptyMorris Jobke2020-09-101-2/+3
|\ \ \ \
| * | | | Set delimiter so that the CommonPrefixes response can properly be determinedJulius Härtl2020-09-101-1/+2
| * | | | fix s3 doesDirectoryExist check for empty directoriesRobin Appelman2020-09-101-1/+1
| | |/ / | |/| |
* | | | Merge pull request #22622 from nextcloud/dependabot/npm_and_yarn/sass-loader-...Morris Jobke2020-09-102-9/+9
|\ \ \ \
| * | | | Bump sass-loader from 9.0.3 to 10.0.2dependabot-preview[bot]2020-09-072-9/+9
* | | | | Merge pull request #22552 from nextcloud/bugfix/noid/opendocument-templatesMorris Jobke2020-09-102-0/+19
|\ \ \ \ \
| * | | | | Update repair step apply new opendocument template mimesJulius Härtl2020-09-042-1/+16
| * | | | | Add opendocument templates to mimetype mappingsJulius Härtl2020-09-031-0/+4
* | | | | | Merge pull request #22615 from nextcloud/fix/22606/popover-flutterMorris Jobke2020-09-103-3/+4
|\ \ \ \ \ \
| * | | | | | Change status popover containerRaimund Schlüßler2020-09-083-3/+4
* | | | | | | Merge pull request #22766 from nextcloud/fix/22507/php-eol-warningMorris Jobke2020-09-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Clarify PHP warning in admin settingsMorris Jobke2020-09-101-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #22765 from nextcloud/bugfix/noid/allow-to-get-activities-...Morris Jobke2020-09-101-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Allow to get activities for files by email againJoas Schilling2020-09-101-3/+3
* | | | | | | | Merge pull request #22762 from nextcloud/bugfix/noid/dont-create-debug-log-in...Morris Jobke2020-09-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't create a deprecation log in base.phpJoas Schilling2020-09-101-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #22744 from nextcloud/shared-cached-permissionsMorris Jobke2020-09-101-6/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | only get the permissions from the share source if it's not already cachedRobin Appelman2020-09-091-6/+5
* | | | | | | | Merge pull request #22614 from nextcloud/fix/22606/popover-boundariesMorris Jobke2020-09-101-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Increase html body height to full content heightRaimund Schlüßler2020-09-051-1/+1
* | | | | | | | Merge pull request #22700 from nextcloud/dependabot/npm_and_yarn/blueimp-md5-...Morris Jobke2020-09-092-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump blueimp-md5 from 2.17.0 to 2.18.0dependabot[bot]2020-09-092-4/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #22520 from nextcloud/normalize-path-invalid-utf8Roeland Jago Douma2020-09-091-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | dont use `false` as cache key for non utf8 path in normalizePathRobin Appelman2020-08-311-1/+1
* | | | | | | | | Merge pull request #22651 from nextcloud/fix/s3/empty_filesRoeland Jago Douma2020-09-092-2/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix reading empty files from objectstorageRoeland Jago Douma2020-09-092-2/+13
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #22663 from nextcloud/dependabot/npm_and_yarn/build/karma-...Roeland Jago Douma2020-09-092-22/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump karma-viewport from 1.0.6 to 1.0.7 in /builddependabot[bot]2020-09-082-22/+15
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #22587 from timm2k/patch-1Roeland Jago Douma2020-09-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check if var debugMode existstimm2k2020-09-041-1/+1
* | | | | | | | | | Merge pull request #22600 from nextcloud/dependabot/npm_and_yarn/build/http-p...Roeland Jago Douma2020-09-091-10/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [Security] Bump http-proxy from 1.17.0 to 1.18.1 in /builddependabot-preview[bot]2020-09-041-10/+12
* | | | | | | | | | | Merge pull request #22634 from nextcloud-pr-bot/automated/noid/psalm-baseline...Roeland Jago Douma2020-09-091-13/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update psalm baselineNextcloud-PR-Bot2020-09-091-13/+2
* | | | | | | | | | | Merge pull request #22657 from nextcloud/bugfix/noid/quota-trash-creationMorris Jobke2020-09-092-3/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix code styleMorris Jobke2020-09-091-1/+0