summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24852 from nextcloud/version/21/beta4v21.0.0beta4Roeland Jago Douma2020-12-301-2/+2
|\
| * 21 beta4Roeland Jago Douma2020-12-281-2/+2
* | Merge pull request #24909 from nextcloud/fix/ci/psalm-ocpRoeland Jago Douma2020-12-301-0/+1
|\ \
| * | Fix expceted psalm-ocp.xml fileRoeland Jago Douma2020-12-301-0/+1
* | | Merge pull request #24571 from nextcloud/Valdnet-patch-4Roeland Jago Douma2020-12-303-3/+3
|\ \ \ | |/ / |/| |
| * | Change to the name of the appValdnet2020-12-303-3/+3
|/ /
* | Merge pull request #24903 from nextcloud/enh/psalm-ocpRoeland Jago Douma2020-12-303-0/+293
|\ \
| * | Add dedicated baseline for OCPRoeland Jago Douma2020-12-303-0/+293
* | | Merge pull request #24888 from nextcloud/dependabot/composer/nikic/php-parser...Christoph Wurst2020-12-301-0/+0
|\ \ \
| * | | Bump nikic/php-parser from 4.3.0 to 4.10.4Christoph Wurst2020-12-301-0/+0
|/ / /
* | | Merge pull request #24895 from nextcloud/make-integration-tests-work-with-bot...Roeland Jago Douma2020-12-304-3/+5
|\ \ \
| * | | Make integration tests work with both PHP 7.3 and 7.4Daniel Calviño Sánchez2020-12-304-3/+5
* | | | Merge pull request #24887 from nextcloud/dependabot/composer/swiftmailer/swif...Christoph Wurst2020-12-301-0/+0
|\ \ \ \
| * | | | Bump swiftmailer/swiftmailer from 6.2.3 to 6.2.4Christoph Wurst2020-12-301-0/+0
* | | | | Merge pull request #24860 from nextcloud/bugfix/noid/well-known-htaccessRoeland Jago Douma2020-12-301-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make sure we properly ass well-known paths to index.phpJulius Härtl2020-12-291-2/+2
* | | | | Merge pull request #24879 from nextcloud/dependachristoph/composer/symfony-4....Christoph Wurst2020-12-301-0/+0
|\ \ \ \ \
| * | | | | Bump the Symfony family from 4.4.15 to 4.4.18Christoph Wurst2020-12-291-0/+0
* | | | | | Merge pull request #24898 from nextcloud-pr-bot/automated/noid/psalm-baseline...Roeland Jago Douma2020-12-301-7/+2
|\ \ \ \ \ \
| * | | | | | Update psalm baselineNextcloud-PR-Bot2020-12-301-7/+2
|/ / / / / /
* | | / / / [tx-robot] updated from transifexNextcloud bot2020-12-3026-20/+60
| |_|/ / / |/| | | |
* | | | | Merge pull request #24865 from nextcloud/tests/node-build-cleanRoeland Jago Douma2020-12-291-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Cleanup bundle files before checking the rebuildJulius Härtl2020-12-291-0/+1
* | | | | Merge pull request #22921 from nextcloud/no-root-encryption-wrapperJulius Härtl2020-12-291-1/+1
|\ \ \ \ \
| * | | | | dont apply encryption wrapper for root mountRobin Appelman2020-12-291-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #24873 from nextcloud/dependencies/sabre-IIChristoph Wurst2020-12-291-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump sabre/dav to 4.1Christoph Wurst2020-12-291-0/+0
|/ / / /
* | | | Merge pull request #23958 from nextcloud/dependabot/npm_and_yarn/build/node-s...dependabot-preview[bot]2020-12-292-207/+263
|\ \ \ \ | |/ / / |/| | |
| * | | Bump node-sass from 4.14.1 to 5.0.0 in /builddependabot-preview[bot]2020-12-292-207/+263
* | | | Merge pull request #24772 from nextcloud/dependabot/npm_and_yarn/dompurify-2.2.6dependabot-preview[bot]2020-12-2987-128/+14
|\ \ \ \
| * | | | Bump dompurify from 2.2.3 to 2.2.6dependabot-preview[bot]2020-12-2987-128/+14
| |/ / /
* | | | Merge pull request #24874 from nextcloud/enh/exception_loggingRoeland Jago Douma2020-12-292-4/+22
|\ \ \ \
| * | | | Avoid huge exception argument loggingRoeland Jago Douma2020-12-292-4/+22
* | | | | Merge pull request #24533 from nextcloud/dependabot/composer/icewind/streams-...Christoph Wurst2020-12-2918-181/+150
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Bump icewind/streams from 0.7.1 to 0.7.2Christoph Wurst2020-12-2918-181/+150
| |/ / /
* | | | Merge pull request #24872 from nextcloud/tests/jsunit-chromiumRoeland Jago Douma2020-12-298-2242/+1044
|\ \ \ \ | |/ / / |/| | |
| * | | jsunit: harden avatar tests to pass with fractional scaling of elementsJulius Härtl2020-12-291-8/+8
| * | | jsunit: Remove warnings during test runsJulius Härtl2020-12-292-17/+2
| * | | jsunit: Add proper lang tag to documentJulius Härtl2020-12-291-0/+1
| * | | jsunit: Run jsunit with chromium/puppeteer on github actionsJulius Härtl2020-12-295-2217/+1033
* | | | [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
|/ /
* | Merge pull request #24833 from nextcloud/fix-total-upload-size-overwritten-by...Roeland Jago Douma2020-12-281-1/+4
|\ \
| * | Fix total upload size overwritten by next uploadDaniel Calviño Sánchez2020-12-231-1/+4
* | | 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.7dependabot-preview[bot]2020-12-216-7/+10
* | | | Merge pull request #24832 from nextcloud/enh/24813/trash-autoid-bigintRoeland Jago Douma2020-12-282-2/+2
|\ \ \ \
| * | | | Make oc_files_trash.auto_id a bigintVincent Petry2020-12-232-2/+2
| | |/ / | |/| |
* | | | Merge pull request #24843 from nextcloud/dependabot/npm_and_yarn/webpack-cli-...dependabot-preview[bot]2020-12-282-81/+29
|\ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 14:07:43 +0000