aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24533 from ↵Christoph Wurst2020-12-2918-181/+150
|\ | | | | | | | | nextcloud/dependabot/composer/icewind/streams-0.7.2 Bump icewind/streams from 0.7.1 to 0.7.2
| * Bump icewind/streams from 0.7.1 to 0.7.2Christoph Wurst2020-12-2918-181/+150
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #24872 from nextcloud/tests/jsunit-chromiumRoeland Jago Douma2020-12-298-2242/+1044
|\ \ | |/ |/| Run jsunit with chromium/puppeteer
| * jsunit: harden avatar tests to pass with fractional scaling of elementsJulius Härtl2020-12-291-8/+8
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * jsunit: Remove warnings during test runsJulius Härtl2020-12-292-17/+2
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * jsunit: Add proper lang tag to documentJulius Härtl2020-12-291-0/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * jsunit: Run jsunit with chromium/puppeteer on github actionsJulius Härtl2020-12-295-2217/+1033
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2020-12-2918-58/+90
|/
* Merge pull request #24856 from nextcloud/psalm/whitelist-appsJulius Härtl2020-12-281-1/+29
|\
| * Add whitelist for apps inside of the server repoJulius Härtl2020-12-281-1/+29
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #24833 from ↵Roeland Jago Douma2020-12-281-1/+4
|\ | | | | | | | | nextcloud/fix-total-upload-size-overwritten-by-next-upload Fix total upload size overwritten by next upload
| * Fix total upload size overwritten by next uploadDaniel Calviño Sánchez2020-12-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upload progress is based on the "totalToUpload" variable. However, as the variable is set when an upload is submitted, if another upload is submitted before the previous one finished the upload progress only took into account the size of the new upload (although the upload itself worked fine; the files of the new submitted upload are added to the active one). Now "totalToUpload" is either increased or set depending on whether an upload is active or not. Note that although "data.total" holds the total size of the files being uploaded "totalToUpload" needs to be used in "fileuploadprogressall" instead; "totalToUpload" is calculated when the upload is submitted, but since 7c4c5fe6ae91 the actual upload of the files, and thus updating the value of "data.total", may be deferred until the parent folders were created. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #24775 from nextcloud/dependabot/npm_and_yarn/marked-1.2.7Roeland Jago Douma2020-12-286-7/+10
|\ \ | | | | | | Bump marked from 1.2.6 to 1.2.7
| * | Bump marked from 1.2.6 to 1.2.7dependabot-preview[bot]2020-12-216-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [marked](https://github.com/markedjs/marked) from 1.2.6 to 1.2.7. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js) - [Commits](https://github.com/markedjs/marked/compare/v1.2.6...v1.2.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | | Merge pull request #24832 from nextcloud/enh/24813/trash-autoid-bigintRoeland Jago Douma2020-12-282-2/+2
|\ \ \ | | | | | | | | Make oc_files_trash.auto_id a bigint
| * | | Make oc_files_trash.auto_id a bigintVincent Petry2020-12-232-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | Adjusted migration. Added to occ command to update existing tables. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* | | Merge pull request #24843 from ↵dependabot-preview[bot]2020-12-282-81/+29
|\ \ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/webpack-cli-4.3.0
| * | | Bump webpack-cli from 4.2.0 to 4.3.0dependabot-preview[bot]2020-12-262-81/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.2.0 to 4.3.0. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.2.0...webpack-cli@4.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | Merge pull request #19942 from ACTom/add-mindmap-iconChristoph Wurst2020-12-283-3/+14
|\ \ \ \ | | | | | | | | | | Add mindmap type file icon
| * | | | Readd test getOnlyDefaultAliases()ACTom2020-12-282-3/+117
| | | | | | | | | | | | | | | | | | | | Signed-off-by: ACTom <i@actom.me>
| * | | | fix php-cs check fail(tests/lib/IntegrityCheck/CheckerTest.php)ACTom2020-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: ACTom <i@actom.me>
| * | | | fix Test\IntegrityCheck\CheckerTest tests failACTom2020-10-181-111/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: ACTom <i@actom.me>
| * | | | Modify mindmap type file iconACTom2020-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: ACTom <i@actom.me>
| * | | | Add mindmap type file iconACTom2020-10-171-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: ACTom <i@actom.me>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-12-286-2/+26
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2020-12-274-2/+6
| |/ / / |/| | |
* | | | Merge pull request #24844 from ↵dependabot-preview[bot]2020-12-262-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.3
| * | | | Bump webpack-merge from 5.7.2 to 5.7.3dependabot-preview[bot]2020-12-262-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.7.2 to 5.7.3. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/compare/v5.7.2...v5.7.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-12-268-2/+130
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2020-12-246-14/+18
| | | |
* | | | Merge pull request #24765 from nextcloud/version/21/beta3v21.0.0beta3Roeland Jago Douma2020-12-232-4/+4
|\ \ \ \ | | | | | | | | | | 21 beta3
| * | | | 21 beta3Roeland Jago Douma2020-12-232-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #24830 from nextcloud/bugfix/noid/readme-mention-autoloaderChristoph Wurst2020-12-231-1/+15
|\ \ \ \ \ | |/ / / / |/| | | | Add README section for committing back-end code
| * | | | Add README section for committing back-end codeVincent Petry2020-12-231-1/+15
| | |/ / | |/| | | | | | | | | | Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* | | | Merge pull request #24812 from nextcloud/dependencies/zipstreamer-2.0.0Christoph Wurst2020-12-231-0/+0
|\ \ \ \ | |/ / / |/| | | Bump deepdiver/zipstreamer to 2.0.0
| * | | Bump deepdiver/zipstreamer to 2.0.0Christoph Wurst2020-12-231-0/+0
|/ / / | | | | | | | | | | | | | | | For PSR-4 compat. The rest is unchanged. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #24816 from nextcloud/techdept/dead-packagesJulius Härtl2020-12-235-89/+2
|\ \ \ | | | | | | | | Drop all dead packages
| * | | Drop all dead packagesChristoph Wurst2020-12-235-89/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently we have plenty of leftover of previous sub-dependencies. Composer automatically dumps those with any future dependency update, so I'm dropping them in an atomic step. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #24610 from ↵Roeland Jago Douma2020-12-235-0/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/enh/adding-missing-event-on-deleted-shares adding a ShareDeletedEvent
| * | | | Move to single share event. Just emit more if neededRoeland Jago Douma2020-12-232-22/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | deleteChildren only returns arrayMaxence Lange2020-12-231-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | | cs fixMaxence Lange2020-12-231-3/+3
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | | +ShareDeletedEventMaxence Lange2020-12-234-0/+84
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | | Merge pull request #24824 from nextcloud/enh/catch_heartbeat_errorJulius Härtl2020-12-233-4/+9
|\ \ \ \ \ | |/ / / / |/| | | | Catch the error on heartbeat update
| * | | | Catch the error on heartbeat updateRoeland Jago Douma2020-12-233-4/+9
|/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* / / / [tx-robot] updated from transifexNextcloud bot2020-12-2310-20/+24
|/ / /
* | | Merge pull request #24819 from nextcloud/techdept/update-psalm-baselineChristoph Wurst2020-12-221-22/+7
|\ \ \ | | | | | | | | Update the Psalm baseline
| * | | Update the Psalm baselineChristoph Wurst2020-12-221-22/+7
|/ / / | | | | | | | | | | | | | | | Some issues were resolved, hence every CI run shows this diff. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #24770 from nextcloud/fix-dialog-buttonsJulius Härtl2020-12-224-4/+6
|\ \ \
| * | | Increase horizontal paddingMarco Ambrosini2020-12-223-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>