]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Wed, 6 Jan 2021 12:30:02 +0000 (13:30 +0100)]
Update root.crl due to revocation of transmission.crt
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 6 Jan 2021 12:31:03 +0000 (13:31 +0100)]
Revert "Update root.crl due to revocation of transmission.crt"
This reverts commit
48197dced321f7f6ca276511652fa6d99bf75453 .
Morris Jobke [Wed, 6 Jan 2021 12:30:02 +0000 (13:30 +0100)]
Update root.crl due to revocation of transmission.crt
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Wed, 6 Jan 2021 08:30:24 +0000 (09:30 +0100)]
Merge pull request #24979 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
Nextcloud-PR-Bot [Wed, 6 Jan 2021 04:51:06 +0000 (04:51 +0000)]
Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
Nextcloud bot [Wed, 6 Jan 2021 02:20:00 +0000 (02:20 +0000)]
[tx-robot] updated from transifex
Julius Härtl [Tue, 5 Jan 2021 22:01:59 +0000 (23:01 +0100)]
Merge pull request #24900 from nextcloud/fix/user-settings
Fix updating user settings
Julien Veyssier [Tue, 5 Jan 2021 17:58:21 +0000 (18:58 +0100)]
Merge pull request #24970 from nina-py/24938-dashboard-greetings-show-good-morning-after-noon
Fix dashboard greetings that show 'good morning' after noon
Julius Härtl [Tue, 5 Jan 2021 15:44:29 +0000 (16:44 +0100)]
Merge pull request #24917 from nextcloud/enhancement/guzzle7
Update all the things for Guzzle 7 (php8 compat)
Julius Härtl [Tue, 5 Jan 2021 14:49:16 +0000 (15:49 +0100)]
Merge pull request #24961 from nextcloud/bugfix/noid/copy-tests
Christoph Wurst [Wed, 30 Dec 2020 19:03:51 +0000 (20:03 +0100)]
Update all the things for Guzzle 7 (php8 compat)
Guzzle 6 doesn't support php8, hence we need this for 21 for full php8
support.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Christoph Wurst [Wed, 30 Dec 2020 09:15:35 +0000 (10:15 +0100)]
Fix updating user settings
The requests dispatched from the personal settings page don't always
send all the possible params but just a subset. Hence requests currently
fail on master e.g. when you update your email. This makes the arguments
optional again.
Regression of
da9462b482c77b71d6623be43a6aa1eda3d7cc06
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Roeland Jago Douma [Tue, 5 Jan 2021 11:57:00 +0000 (12:57 +0100)]
Merge pull request #24964 from nextcloud/bugfix/noid/internal-server-error-when-importing-broken-ics-file
Don't throw a 500 when importing a broken ics reminder file
Nina Pypchenko [Tue, 5 Jan 2021 10:40:35 +0000 (21:40 +1100)]
Fix dashboard greetings that show 'good morning' after noon
Updated dashboard greetings to show "Good afternoon" after 12:00 instead of 13:00.
Updated time periods for greetings:
- Morning: 5:00 to 11.59
- Afternoon: 12:00 to 17.59
- Evening: 18:00 to 21:59
- Night: 22:00 to 4.59
Updated night-time greeting to "Hello" as "Good night" is a kind of goodbye.
Closes #24938.
Signed-off-by: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>
Joas Schilling [Tue, 5 Jan 2021 09:08:14 +0000 (10:08 +0100)]
Don't throw a 500 when importing a broken ics reminder file
Signed-off-by: Joas Schilling <coding@schilljs.com>
Julius Härtl [Tue, 5 Jan 2021 08:32:33 +0000 (09:32 +0100)]
Merge pull request #24829 from nextcloud/bugfix/24813/add-missing-migrations
Julius Härtl [Tue, 5 Jan 2021 08:12:11 +0000 (09:12 +0100)]
Properly handle result when copying with failure and throw in tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Tue, 5 Jan 2021 07:53:21 +0000 (08:53 +0100)]
Fix writeStream mocking
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Nextcloud bot [Tue, 5 Jan 2021 02:21:26 +0000 (02:21 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Mon, 4 Jan 2021 11:55:11 +0000 (12:55 +0100)]
Merge pull request #24936 from nextcloud/dependabot/npm_and_yarn/webpack-cli-4.3.1
Bump webpack-cli from 4.3.0 to 4.3.1
Christoph Wurst [Mon, 4 Jan 2021 10:06:30 +0000 (11:06 +0100)]
Merge pull request #24907 from nextcloud/fix/license-headers-21-II
Update license headers
Nextcloud bot [Mon, 4 Jan 2021 02:21:48 +0000 (02:21 +0000)]
[tx-robot] updated from transifex
Christoph Wurst [Sun, 3 Jan 2021 11:40:49 +0000 (12:40 +0100)]
Merge pull request #24946 from nextcloud/dependabot/composer/pimple/pimple-3.3.1
Bump pimple/pimple from 3.2.3 to 3.3.1
Christoph Wurst [Sun, 3 Jan 2021 09:43:21 +0000 (10:43 +0100)]
Bump pimple/pimple from 3.2.3 to 3.3.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Nextcloud bot [Sun, 3 Jan 2021 02:20:55 +0000 (02:20 +0000)]
[tx-robot] updated from transifex
dependabot-preview[bot] [Sat, 2 Jan 2021 16:55:04 +0000 (16:55 +0000)]
Merge pull request #24941 from nextcloud/dependabot/submodules/3rdparty-
e8bad7c
dependabot-preview[bot] [Sat, 2 Jan 2021 16:15:53 +0000 (16:15 +0000)]
Bump 3rdparty from `
225c515 ` to `
e8bad7c `
Bumps [3rdparty](https://github.com/nextcloud/3rdparty) from `
225c515 ` to `
e8bad7c `.
- [Release notes](https://github.com/nextcloud/3rdparty/releases)
- [Commits](https://github.com/nextcloud/3rdparty/compare/
225c51509edf9ab3557ce109c3762731e7863e10 ...
e8bad7cc6fdbca7370dc882607847069ed30c2b1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Christoph Wurst [Sat, 2 Jan 2021 15:58:13 +0000 (16:58 +0100)]
Merge pull request #24916 from nextcloud/enh/psr-updates
Bump psr/log and psr/http-client
dependabot-preview[bot] [Sat, 2 Jan 2021 02:18:56 +0000 (02:18 +0000)]
Bump webpack-cli from 4.3.0 to 4.3.1
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.3.0 to 4.3.1.
- [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.3.0...webpack-cli@4.3.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Nextcloud bot [Fri, 1 Jan 2021 02:21:03 +0000 (02:21 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Thu, 31 Dec 2020 02:27:04 +0000 (02:27 +0000)]
[tx-robot] updated from transifex
Christoph Wurst [Wed, 30 Dec 2020 18:15:52 +0000 (19:15 +0100)]
Bump psr/log and psr/http-client
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Christoph Wurst [Wed, 30 Dec 2020 18:41:43 +0000 (19:41 +0100)]
Merge pull request #24890 from nextcloud/dependabot/composer/pear/archive_tar-1.4.11
Bump pear/archive_tar from 1.4.9 to 1.4.11
Christoph Wurst [Tue, 29 Dec 2020 16:13:07 +0000 (17:13 +0100)]
Bump pear/archive_tar from 1.4.9 to 1.4.11
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Christoph Wurst [Wed, 30 Dec 2020 16:51:22 +0000 (17:51 +0100)]
Merge pull request #24886 from nextcloud/dependabot/composer/guzzlehttp/guzzle-6.5.5
Bump guzzlehttp/guzzle from 6.5.2 to 6.5.5
Julius Härtl [Wed, 30 Dec 2020 16:40:58 +0000 (17:40 +0100)]
Merge pull request #24864 from nextcloud/bugfix/noid/always-show-external-share
Also include external share results in recommendations
Roeland Jago Douma [Wed, 30 Dec 2020 14:09:20 +0000 (15:09 +0100)]
Merge pull request #24852 from nextcloud/version/21/beta4
21 beta4
Roeland Jago Douma [Wed, 30 Dec 2020 14:07:43 +0000 (15:07 +0100)]
Merge pull request #24909 from nextcloud/fix/ci/psalm-ocp
Fix expceted psalm-ocp.xml file
Roeland Jago Douma [Wed, 30 Dec 2020 13:32:44 +0000 (14:32 +0100)]
Merge pull request #24571 from nextcloud/Valdnet-patch-4
l10n: Change to the name of the app
Roeland Jago Douma [Wed, 30 Dec 2020 13:32:15 +0000 (14:32 +0100)]
Fix expceted psalm-ocp.xml file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Christoph Wurst [Tue, 29 Dec 2020 15:56:00 +0000 (16:56 +0100)]
Bump guzzlehttp/guzzle from 6.5.2 to 6.5.5
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Christoph Wurst [Wed, 30 Dec 2020 13:07:05 +0000 (14:07 +0100)]
Update license headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Valdnet [Sat, 5 Dec 2020 19:31:17 +0000 (20:31 +0100)]
Change to the name of the app
It should refer to the application name "Files".
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
Roeland Jago Douma [Wed, 30 Dec 2020 12:23:25 +0000 (13:23 +0100)]
Merge pull request #24903 from nextcloud/enh/psalm-ocp
Add dedicated baseline for OCP
Christoph Wurst [Wed, 30 Dec 2020 12:16:35 +0000 (13:16 +0100)]
Merge pull request #24888 from nextcloud/dependabot/composer/nikic/php-parser-4.10.4
Bump nikic/php-parser from 4.3.0 to 4.10.4
Christoph Wurst [Tue, 29 Dec 2020 16:03:50 +0000 (17:03 +0100)]
Bump nikic/php-parser from 4.3.0 to 4.10.4
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Roeland Jago Douma [Wed, 30 Dec 2020 10:06:00 +0000 (11:06 +0100)]
Add dedicated baseline for OCP
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 30 Dec 2020 09:51:58 +0000 (10:51 +0100)]
Merge pull request #24895 from nextcloud/make-integration-tests-work-with-both-php-7.3-and-7.4
Make integration tests work with both PHP 7.3 and 7.4
Christoph Wurst [Wed, 30 Dec 2020 09:48:19 +0000 (10:48 +0100)]
Merge pull request #24887 from nextcloud/dependabot/composer/swiftmailer/swiftmailer-6.2.4
Bump swiftmailer/swiftmailer from 6.2.3 to 6.2.4
Roeland Jago Douma [Wed, 30 Dec 2020 09:47:48 +0000 (10:47 +0100)]
Merge pull request #24860 from nextcloud/bugfix/noid/well-known-htaccess
Make sure we properly ass well-known paths to index.php
Julius Härtl [Mon, 28 Dec 2020 16:15:15 +0000 (17:15 +0100)]
Also include external share results in recommendations
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Christoph Wurst [Tue, 29 Dec 2020 16:00:01 +0000 (17:00 +0100)]
Bump swiftmailer/swiftmailer from 6.2.3 to 6.2.4
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Christoph Wurst [Wed, 30 Dec 2020 07:56:16 +0000 (08:56 +0100)]
Merge pull request #24879 from nextcloud/dependachristoph/composer/symfony-4.4.18
Bump the Symfony family from 4.4.15 to 4.4.18
Roeland Jago Douma [Wed, 30 Dec 2020 07:32:23 +0000 (08:32 +0100)]
Merge pull request #24898 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
Daniel Calviño Sánchez [Tue, 29 Dec 2020 18:48:38 +0000 (19:48 +0100)]
Make integration tests work with both PHP 7.3 and 7.4
The "Trashbin" and "WebDav" traits were using each other in a circular
dependency ("WebDav" -> "Sharing" -> "Provisioning" -> "BasicStructure"
-> "Trashbin" -> "WebDav"). In PHP 7.3 this worked fine, but in PHP 7.4
the fatal error "Trait 'WebDav' not found in .../Trashbin.php" was
thrown. To solve this now the "TrashBin" trait no longer explicitly uses
"WebDav".
However, due to this change, the class using "TrashBin" is now expected
to also use "WebDav". As the "Trashbin" trait was not needed by most
contexts using the "BasicStructure" trait "Trashbin" was removed from it
and added only to those contexts that actually need it.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Nextcloud-PR-Bot [Wed, 30 Dec 2020 04:42:04 +0000 (04:42 +0000)]
Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
Nextcloud bot [Wed, 30 Dec 2020 02:19:06 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Tue, 29 Dec 2020 14:46:51 +0000 (15:46 +0100)]
Merge pull request #24865 from nextcloud/tests/node-build-clean
Cleanup bundle files before checking the rebuild
Christoph Wurst [Tue, 29 Dec 2020 13:36:30 +0000 (14:36 +0100)]
Bump the Symfony family from 4.4.15 to 4.4.18
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Julius Härtl [Tue, 29 Dec 2020 13:08:53 +0000 (14:08 +0100)]
Merge pull request #22921 from nextcloud/no-root-encryption-wrapper
dont apply encryption wrapper for root mount
Christoph Wurst [Tue, 29 Dec 2020 13:00:37 +0000 (14:00 +0100)]
Merge pull request #24873 from nextcloud/dependencies/sabre-II
Bump sabre/dav to 4.1
Christoph Wurst [Tue, 29 Dec 2020 07:31:30 +0000 (08:31 +0100)]
Bump sabre/dav to 4.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Robin Appelman [Thu, 17 Sep 2020 16:14:48 +0000 (18:14 +0200)]
dont apply encryption wrapper for root mount
the `shouldEncrypt` already disables encryption for anything thats not in the users data folder,
however the encryption wrapper being applied anyway on the root folder breaks groupfolders
Signed-off-by: Robin Appelman <robin@icewind.nl>
dependabot-preview[bot] [Tue, 29 Dec 2020 11:21:14 +0000 (11:21 +0000)]
Merge pull request #23958 from nextcloud/dependabot/npm_and_yarn/build/node-sass-5.0.0
Julius Härtl [Mon, 28 Dec 2020 18:39:18 +0000 (19:39 +0100)]
Cleanup bundle files before checking the rebuild
Signed-off-by: Julius Härtl <jus@bitgrid.net>
dependabot-preview[bot] [Tue, 29 Dec 2020 11:02:16 +0000 (11:02 +0000)]
Merge pull request #24772 from nextcloud/dependabot/npm_and_yarn/dompurify-2.2.6
Roeland Jago Douma [Tue, 29 Dec 2020 10:38:27 +0000 (11:38 +0100)]
Merge pull request #24874 from nextcloud/enh/exception_logging
Avoid huge exception argument logging
Julius Härtl [Mon, 28 Dec 2020 14:36:23 +0000 (15:36 +0100)]
Make sure we properly ass well-known paths to index.php
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Christoph Wurst [Tue, 29 Dec 2020 10:24:37 +0000 (11:24 +0100)]
Merge pull request #24533 from nextcloud/dependabot/composer/icewind/streams-0.7.2
Bump icewind/streams from 0.7.1 to 0.7.2
dependabot-preview[bot] [Mon, 28 Dec 2020 09:52:41 +0000 (09:52 +0000)]
Bump dompurify from 2.2.3 to 2.2.6
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.2.3 to 2.2.6.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/2.2.3...2.2.6)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
dependabot-preview[bot] [Tue, 29 Dec 2020 10:01:34 +0000 (10:01 +0000)]
Bump node-sass from 4.14.1 to 5.0.0 in /build
Bumps [node-sass](https://github.com/sass/node-sass) from 4.14.1 to 5.0.0.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.14.1...v5.0.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Roeland Jago Douma [Tue, 29 Dec 2020 09:59:49 +0000 (10:59 +0100)]
Merge pull request #24872 from nextcloud/tests/jsunit-chromium
Run jsunit with chromium/puppeteer
Roeland Jago Douma [Tue, 29 Dec 2020 09:50:53 +0000 (10:50 +0100)]
Avoid huge exception argument logging
In some cases it might happen that you have an argument that deep down
somewhere has an array with a lot of entries (think thousands). Now
before we would just happily print them all. Which would fill the log.
Now it will just print the first 5. And add a line that there are N
more.
If you are on debug level we will still print them all.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Christoph Wurst [Thu, 3 Dec 2020 10:03:17 +0000 (11:03 +0100)]
Bump icewind/streams from 0.7.1 to 0.7.2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Julius Härtl [Tue, 29 Dec 2020 07:35:09 +0000 (08:35 +0100)]
jsunit: harden avatar tests to pass with fractional scaling of elements
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Tue, 29 Dec 2020 07:32:26 +0000 (08:32 +0100)]
jsunit: Remove warnings during test runs
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Tue, 29 Dec 2020 07:32:00 +0000 (08:32 +0100)]
jsunit: Add proper lang tag to document
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Tue, 29 Dec 2020 07:18:29 +0000 (08:18 +0100)]
jsunit: Run jsunit with chromium/puppeteer on github actions
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Nextcloud bot [Tue, 29 Dec 2020 02:19:50 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Julius Härtl [Mon, 28 Dec 2020 17:33:28 +0000 (18:33 +0100)]
Merge pull request #24856 from nextcloud/psalm/whitelist-apps
Julius Härtl [Mon, 28 Dec 2020 10:26:50 +0000 (11:26 +0100)]
Add whitelist for apps inside of the server repo
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Roeland Jago Douma [Mon, 28 Dec 2020 10:18:48 +0000 (11:18 +0100)]
Merge pull request #24833 from nextcloud/fix-total-upload-size-overwritten-by-next-upload
Fix total upload size overwritten by next upload
Roeland Jago Douma [Mon, 28 Dec 2020 09:47:55 +0000 (10:47 +0100)]
Merge pull request #24775 from nextcloud/dependabot/npm_and_yarn/marked-1.2.7
Bump marked from 1.2.6 to 1.2.7
Roeland Jago Douma [Mon, 28 Dec 2020 09:43:16 +0000 (10:43 +0100)]
Merge pull request #24832 from nextcloud/enh/24813/trash-autoid-bigint
Make oc_files_trash.auto_id a bigint
dependabot-preview[bot] [Mon, 28 Dec 2020 09:39:48 +0000 (09:39 +0000)]
Merge pull request #24843 from nextcloud/dependabot/npm_and_yarn/webpack-cli-4.3.0
Roeland Jago Douma [Mon, 28 Dec 2020 09:22:50 +0000 (10:22 +0100)]
21 beta4
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Christoph Wurst [Mon, 28 Dec 2020 09:13:38 +0000 (10:13 +0100)]
Merge pull request #19942 from ACTom/add-mindmap-icon
Add mindmap type file icon
ACTom [Mon, 28 Dec 2020 05:59:10 +0000 (13:59 +0800)]
Readd test getOnlyDefaultAliases()
Signed-off-by: ACTom <i@actom.me>
Nextcloud bot [Mon, 28 Dec 2020 02:19:08 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 27 Dec 2020 02:24:43 +0000 (02:24 +0000)]
[tx-robot] updated from transifex
dependabot-preview[bot] [Sat, 26 Dec 2020 03:10:42 +0000 (03:10 +0000)]
Bump webpack-cli from 4.2.0 to 4.3.0
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>
dependabot-preview[bot] [Sat, 26 Dec 2020 03:08:07 +0000 (03:08 +0000)]
Merge pull request #24844 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.3
Nextcloud bot [Sat, 26 Dec 2020 02:19:48 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
dependabot-preview[bot] [Sat, 26 Dec 2020 02:17:13 +0000 (02:17 +0000)]
Bump webpack-merge from 5.7.2 to 5.7.3
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>
Nextcloud bot [Thu, 24 Dec 2020 02:20:06 +0000 (02:20 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Wed, 23 Dec 2020 19:08:32 +0000 (20:08 +0100)]
Merge pull request #24765 from nextcloud/version/21/beta3
21 beta3
Christoph Wurst [Wed, 23 Dec 2020 19:07:10 +0000 (20:07 +0100)]
Merge pull request #24830 from nextcloud/bugfix/noid/readme-mention-autoloader
Add README section for committing back-end code
Roeland Jago Douma [Fri, 18 Dec 2020 12:19:05 +0000 (13:19 +0100)]
21 beta3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Daniel Calviño Sánchez [Wed, 23 Dec 2020 17:53:01 +0000 (18:53 +0100)]
Fix total upload size overwritten by next upload
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>
Vincent Petry [Wed, 23 Dec 2020 16:50:50 +0000 (17:50 +0100)]
Make oc_files_trash.auto_id a bigint
Adjusted migration.
Added to occ command to update existing tables.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>