summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | Merge pull request #24730 from J0WI/fix-trusted-ipv6Julius Härtl2020-12-211-1/+1
|\ \ \ | | | | | | | | Fix IPv6 localhost regex
| * | | Fix IPv6 localhost regexJ0WI2020-12-161-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: J0WI <J0WI@users.noreply.github.com>
* | | | Merge pull request #23319 from nextcloud/fix/argon2-descriptionsRoeland Jago Douma2020-12-211-14/+13
|\ \ \ \ | | | | | | | | | | Fix Argon2 descriptions
| * | | | Fix Argon2 descriptionsMichaIng2020-10-091-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The threads option for the password_hash function does not define the maximum allowed number of CPU threads to be used by the hashing algorithm but the exact number of threads that is used. Similarly the memory_cost option for the password_hash function does not define the maximum allowed memory to be used by the hashing algorithm, but the exact amount of memory that is used by the hashing table. The minimum value is 8 KiB per thread. The time_cost option for the password_hash function does not define the allowed time in seconds, but the number of iterations for the hash function. If the minimum values are understood, the minimum values are used instead. Signed-off-by: MichaIng <micha@dietpi.com>
* | | | | Merge pull request #24773 from ↵dependabot-preview[bot]2020-12-212-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.2
| * | | | | Bump webpack-merge from 5.6.1 to 5.7.2dependabot-preview[bot]2020-12-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.6.1 to 5.7.2. - [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.6.1...v5.7.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | Merge pull request #24715 from nextcloud/bug/noid/limit-get-incomplete-to-1Roeland Jago Douma2020-12-211-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Limit getIncomplete query to one row
| * | | | | | Limit getIncomplete query to one rowDaniel Kesselberg2020-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | Merge pull request #24776 from ↵Julius Härtl2020-12-212-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/vue-loader-15.9.6 Bump vue-loader from 15.9.5 to 15.9.6
| * | | | | | | Bump vue-loader from 15.9.5 to 15.9.6dependabot-preview[bot]2020-12-192-4/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.9.5 to 15.9.6. - [Release notes](https://github.com/vuejs/vue-loader/releases) - [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-loader/compare/v15.9.5...v15.9.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | Merge pull request #24774 from ↵Julius Härtl2020-12-212-39/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.12.11 Bump @babel/preset-env from 7.12.10 to 7.12.11
| * | | | | | | Bump @babel/preset-env from 7.12.10 to 7.12.11dependabot-preview[bot]2020-12-192-39/+64
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.12.10 to 7.12.11. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.12.11/packages/babel-preset-env) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-12-212-0/+2
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-12-2024-78/+218
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-12-1912-4/+12
|/ / / / / /
* | | | | | Merge pull request #24702 from nextcloud/enhancement/well-known-handler-apiChristoph Wurst2020-12-1821-36/+1022
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add well known handlers API
| * | | | | | Add well known handlers APIChristoph Wurst2020-12-1621-36/+1022
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | Merge pull request #24515 from nextcloud/fix/noid/dav-share-groups-special-charsChristoph Wurst2020-12-184-7/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fixes sharing to group ids with characters that are being url encoded
| * | | | | | | fixes sharing to group ids /w chars that are being url encoded, carddavArthur Schiwon2020-12-161-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | fix finding of groups with decodable chars in their id via DAVArthur Schiwon2020-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | fixes sharing to group ids with characters that are being url encodedArthur Schiwon2020-12-162-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | Merge pull request #24703 from nextcloud/fix/noid/wfe-filename-mountpoint-checkblizzz2020-12-181-2/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | enables the file name check also to match name of mountpoints
| * | | | | | | | consider local external storages, tooArthur Schiwon2020-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | enables the file name check also to match name of mountpointsArthur Schiwon2020-12-151-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | | Merge pull request #24685 from nextcloud/version/21/beta2v21.0.0beta2Roeland Jago Douma2020-12-181-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | 21 beta2
| * | | | | | | | | 21 beta2Roeland Jago Douma2020-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | | Merge pull request #24737 from nextcloud/fix/23544/unset_parameterRoeland Jago Douma2020-12-181-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Also unset the other possible unused paramters
| * | | | | | | | | | Also unset the other possible unused paramtersRoeland Jago Douma2020-12-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2020-12-1852-100/+244
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #24740 from nextcloud/bugfix/24738/improve-phone-region-helpJulius Härtl2020-12-173-3/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve hints for default_phone_region
| * | | | | | | | | | | Improve hints for default_phone_regionJoas Schilling2020-12-173-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | | | | Merge pull request #24717 from nextcloud/enh/noid/memory_limit_to_errorblizzz2020-12-172-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | promoted bad memory_limit check from warning to error as it may break updater
| * | | | | | | | | | | promoted bad memory_limit setting to error as it may break updaterArthur Schiwon2020-12-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2020-12-1710-40/+78
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #24731 from nextcloud/fix/license-headers-21Christoph Wurst2020-12-16564-447/+661
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | Update all license headers for Nextcloud 21
| * | | | | | | | | | Update all license headers for Nextcloud 21Christoph Wurst2020-12-16564-447/+661
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | | Merge pull request #24194 from nextcloud/enh/noid/clear-weather-favoritesJulien Veyssier2020-12-163-6/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add action to clear all weather favorites
| * | | | | | | | | | delete a weather favorite when its icon is clickedJulien Veyssier2020-12-163-6/+14
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julien Veyssier <eneiluj@posteo.net> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>