summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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>
| * | | fix-dialog-buttonsMarco Ambrosini2020-12-181-1/+3
| | |/ | |/| | | | | | | Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
* | | Merge pull request #22222 from nextcloud/enh/social-indexRoeland Jago Douma2020-12-225-0/+221
|\ \ \ | | | | | | | | re-index contacts with social profiles
| * | | re-index contacts with social profilescall-me-matt2020-12-225-0/+221
| | | | | | | | | | | | | | | | Signed-off-by: call-me-matt <nextcloud@matthiasheinisch.de>
* | | | Merge pull request #22916 from J0WI/unifiy-links-to-php.netRoeland Jago Douma2020-12-2231-466/+466
|\ \ \ \ | | | | | | | | | | Unify links to php.net
| * | | | Unify links to php.netJ0WI2020-09-1731-466/+466
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update all links to https://www.php.net/ Signed-off-by: J0WI <J0WI@users.noreply.github.com>
* | | | | Merge pull request #22085 from nextcloud/enh/index-socialprofileRoeland Jago Douma2020-12-221-1/+2
|\ \ \ \ \ | | | | | | | | | | | | adding social profile to search index
| * | | | | adding social profile to search indexmatt2020-08-021-1/+2
| | | | | | | | | | | | | | | | | | required in order to optimize regular background updates of contact avatars from social networks (see https://github.com/nextcloud/contacts/pull/1722#discussion_r463782429)
* | | | | | Merge pull request #24594 from kofemann/dcacheJulius Härtl2020-12-2211-20/+24
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | storage: update IStorage#file_put_contents docs to match usageTigran Mkrtchyan2020-12-2110-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current phpdoc of IStorage#file_put_contents doesnt corresponds to it's actual usage in code, e.g. Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
| * | | | | files: Local#writeStream should use it's own file_put_contentsTigran Mkrtchyan2020-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OC\Files\Storage\Local#writeStream use system provided file_put_contents. However, it overrides file_put_contents, thus expects that the default behaviour can be different. Use Local#file_put_contents in writeStream to benefit from class specific functionality. Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
* | | | | | Merge pull request #24604 from nextcloud/feat/dav/move-calendar-renameJohn Molakvoæ2020-12-222-17/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow to force rename a conflicting calendar
| * | | | | | Allow to force rename a conflicting calendarJohn Molakvoæ (skjnldsv)2020-12-102-17/+71
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-12-226-22/+56
| | | | | |
* | | | | | Merge pull request #24732 from nextcloud/tcitworld-patch-1Christoph Wurst2020-12-211-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add another of my emails to mailmap
| * | | | | | Add another of my emails to mailmapThomas Citharel2020-12-211-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because apparently I edited directly from Github and selected default email Signed-off-by: Thomas Citharel <nextcloud@tcit.fr>
* | | | | | Merge pull request #24796 from nextcloud/fix/set_ttl_on_set_redisRoeland Jago Douma2020-12-211-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Actually set the TTL on redis set
| * | | | | | Actually set the TTL on redis setRoeland Jago Douma2020-12-211-1/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Else well the keys remain for ever and ever. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>