summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update apps/sharebymail/lib/Settings/SettingsManager.phpdems542021-01-281-2/+1
* Update apps/sharebymail/lib/Settings/SettingsManager.phpdems542021-01-281-1/+1
* ReplyTo option for sharebymail Issue #24139Nicolas SIMIDE2021-01-286-26/+246
* Merge pull request #24900 from nextcloud/fix/user-settingsJulius Härtl2021-01-051-26/+27
|\
| * Fix updating user settingsChristoph Wurst2021-01-051-26/+27
* | Merge pull request #24970 from nina-py/24938-dashboard-greetings-show-good-mo...Julien Veyssier2021-01-053-11/+36
|\ \
| * | Fix dashboard greetings that show 'good morning' after noonNina Pypchenko2021-01-053-11/+36
* | | Merge pull request #24917 from nextcloud/enhancement/guzzle7Julius Härtl2021-01-051-0/+0
|\ \ \
| * | | Update all the things for Guzzle 7 (php8 compat)Christoph Wurst2021-01-051-0/+0
| | |/ | |/|
* | | 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
| * | Fix writeStream mockingJulius Härtl2021-01-051-1/+1
* | | Merge pull request #24964 from nextcloud/bugfix/noid/internal-server-error-wh...Roeland Jago Douma2021-01-051-1/+6
|\ \ \ | |_|/ |/| |
| * | Don't throw a 500 when importing a broken ics reminder fileJoas Schilling2021-01-051-1/+6
* | | 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
| * | Adjust share_external tableVincent Petry2020-12-235-1/+75
* | | [tx-robot] updated from transifexNextcloud bot2021-01-0512-10/+20
* | | Merge pull request #24936 from nextcloud/dependabot/npm_and_yarn/webpack-cli-...Roeland Jago Douma2021-01-042-35/+32
|\ \ \
| * | | Bump webpack-cli from 4.3.0 to 4.3.1dependabot-preview[bot]2021-01-022-35/+32
* | | | Merge pull request #24907 from nextcloud/fix/license-headers-21-IIChristoph Wurst2021-01-0454-31/+84
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update license headersChristoph Wurst2020-12-3054-31/+84
* | | | [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.1Christoph Wurst2021-01-031-0/+0
|/ / / /
* | | | [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
|/ / / /
* | | | Merge pull request #24916 from nextcloud/enh/psr-updatesChristoph Wurst2021-01-021-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump psr/log and psr/http-clientChristoph Wurst2020-12-301-0/+0
* | | | [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 nextcloud/dependabot/composer/pear/archive_tar...Christoph Wurst2020-12-301-0/+0
|\ \ \
| * | | Bump pear/archive_tar from 1.4.9 to 1.4.11Christoph Wurst2020-12-301-0/+0
|/ / /
* | | Merge pull request #24886 from nextcloud/dependabot/composer/guzzlehttp/guzzl...Christoph Wurst2020-12-301-0/+0
|\ \ \
| * | | Bump guzzlehttp/guzzle from 6.5.2 to 6.5.5Christoph Wurst2020-12-301-0/+0
| |/ /
* | | Merge pull request #24864 from nextcloud/bugfix/noid/always-show-external-shareJulius Härtl2020-12-303-2/+5
|\ \ \
| * | | Also include external share results in recommendationsJulius Härtl2020-12-303-2/+5
* | | | 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