summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24900 from nextcloud/fix/user-settingsJulius Härtl2021-01-051-26/+27
|\ | | | | Fix updating user settings
| * Fix updating user settingsChristoph Wurst2021-01-051-26/+27
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #24970 from ↵Julien Veyssier2021-01-053-11/+36
|\ \ | | | | | | | | | | | | nina-py/24938-dashboard-greetings-show-good-morning-after-noon Fix dashboard greetings that show 'good morning' after noon
| * | Fix dashboard greetings that show 'good morning' after noonNina Pypchenko2021-01-053-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #24917 from nextcloud/enhancement/guzzle7Julius Härtl2021-01-051-0/+0
|\ \ \ | | | | | | | | Update all the things for Guzzle 7 (php8 compat)
| * | | Update all the things for Guzzle 7 (php8 compat)Christoph Wurst2021-01-051-0/+0
| | |/ | |/| | | | | | | | | | | | | | | | 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>
* | | Merge pull request #24961 from nextcloud/bugfix/noid/copy-testsJulius Härtl2021-01-052-4/+5
|\ \ \ | |/ / |/| |
| * | Properly handle result when copying with failure and throw in testsJulius Härtl2021-01-052-3/+4
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix writeStream mockingJulius Härtl2021-01-051-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #24964 from ↵Roeland Jago Douma2021-01-051-1/+6
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/bugfix/noid/internal-server-error-when-importing-broken-ics-file Don't throw a 500 when importing a broken ics reminder file
| * | Don't throw a 500 when importing a broken ics reminder fileJoas Schilling2021-01-051-1/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #24829 from nextcloud/bugfix/24813/add-missing-migrationsJulius Härtl2021-01-055-1/+88
|\ \ \ | |_|/ |/| |
| * | Also add missing oc_share_external.share_type columnVincent Petry2020-12-232-0/+13
| | | | | | | | | | | | Signed-off-by: Vincent Petry <vincent@nextcloud.com>
| * | Adjust share_external tableVincent Petry2020-12-235-1/+75
| | | | | | | | | | | | | | | | | | | | | Add column "parent" if missing. Drop column "lastscan" if exists. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2021-01-0512-10/+20
| | |
* | | Merge pull request #24936 from ↵Roeland Jago Douma2021-01-042-35/+32
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/webpack-cli-4.3.1 Bump webpack-cli from 4.3.0 to 4.3.1
| * | | Bump webpack-cli from 4.3.0 to 4.3.1dependabot-preview[bot]2021-01-022-35/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #24907 from nextcloud/fix/license-headers-21-IIChristoph Wurst2021-01-0454-31/+84
|\ \ \ \ | |_|_|/ |/| | | Update license headers
| * | | Update license headersChristoph Wurst2020-12-3054-31/+84
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [tx-robot] updated from transifexNextcloud bot2021-01-0412-6/+36
| | | |
* | | | Merge pull request #24946 from nextcloud/dependabot/composer/pimple/pimple-3.3.1Christoph Wurst2021-01-031-0/+0
|\ \ \ \ | | | | | | | | | | Bump pimple/pimple from 3.2.3 to 3.3.1
| * | | | Bump pimple/pimple from 3.2.3 to 3.3.1Christoph Wurst2021-01-031-0/+0
|/ / / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [tx-robot] updated from transifexNextcloud bot2021-01-0318-4/+46
| | | |
* | | | Merge pull request #24941 from nextcloud/dependabot/submodules/3rdparty-e8bad7cdependabot-preview[bot]2021-01-021-0/+0
|\ \ \ \
| * | | | Bump 3rdparty from `225c515` to `e8bad7c`dependabot-preview[bot]2021-01-021-0/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #24916 from nextcloud/enh/psr-updatesChristoph Wurst2021-01-021-0/+0
|\ \ \ \ | |_|/ / |/| | | Bump psr/log and psr/http-client
| * | | Bump psr/log and psr/http-clientChristoph Wurst2020-12-301-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [tx-robot] updated from transifexNextcloud bot2021-01-0120-2/+20
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2020-12-3178-172/+188
|/ / /
* | | Merge pull request #24890 from ↵Christoph Wurst2020-12-301-0/+0
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/composer/pear/archive_tar-1.4.11 Bump pear/archive_tar from 1.4.9 to 1.4.11
| * | | Bump pear/archive_tar from 1.4.9 to 1.4.11Christoph Wurst2020-12-301-0/+0
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #24886 from ↵Christoph Wurst2020-12-301-0/+0
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/composer/guzzlehttp/guzzle-6.5.5 Bump guzzlehttp/guzzle from 6.5.2 to 6.5.5
| * | | Bump guzzlehttp/guzzle from 6.5.2 to 6.5.5Christoph Wurst2020-12-301-0/+0
| |/ / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #24864 from nextcloud/bugfix/noid/always-show-external-shareJulius Härtl2020-12-303-2/+5
|\ \ \ | | | | | | | | Also include external share results in recommendations
| * | | Also include external share results in recommendationsJulius Härtl2020-12-303-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #24852 from nextcloud/version/21/beta4v21.0.0beta4Roeland Jago Douma2020-12-301-2/+2
|\ \ \ \ | | | | | | | | | | 21 beta4
| * | | | 21 beta4Roeland Jago Douma2020-12-281-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #24909 from nextcloud/fix/ci/psalm-ocpRoeland Jago Douma2020-12-301-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix expceted psalm-ocp.xml file
| * | | | | Fix expceted psalm-ocp.xml fileRoeland Jago Douma2020-12-301-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #24571 from nextcloud/Valdnet-patch-4Roeland Jago Douma2020-12-303-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | l10n: Change to the name of the app
| * | | | Change to the name of the appValdnet2020-12-303-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | It should refer to the application name "Files". Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | | | Merge pull request #24903 from nextcloud/enh/psalm-ocpRoeland Jago Douma2020-12-303-0/+293
|\ \ \ \ | | | | | | | | | | Add dedicated baseline for OCP
| * | | | Add dedicated baseline for OCPRoeland Jago Douma2020-12-303-0/+293
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #24888 from ↵Christoph Wurst2020-12-301-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/composer/nikic/php-parser-4.10.4 Bump nikic/php-parser from 4.3.0 to 4.10.4
| * | | | | Bump nikic/php-parser from 4.3.0 to 4.10.4Christoph Wurst2020-12-301-0/+0
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #24895 from ↵Roeland Jago Douma2020-12-304-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Make integration tests work with both PHP 7.3 and 7.4Daniel Calviño Sánchez2020-12-304-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge pull request #24887 from ↵Christoph Wurst2020-12-301-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/composer/swiftmailer/swiftmailer-6.2.4 Bump swiftmailer/swiftmailer from 6.2.3 to 6.2.4
| * | | | | | Bump swiftmailer/swiftmailer from 6.2.3 to 6.2.4Christoph Wurst2020-12-301-0/+0
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | 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.php
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-25 05:50:50 +0000