summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16565 from nextcloud/backport/16555/stable15Roeland Jago Douma2019-07-272-4/+7
|\ | | | | [stable15] use a pattern to identify sensitive config keys
| * treat sensitive config keys by patternArthur Schiwon2019-07-262-4/+7
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #16568 from nextcloud/backport/16163/stable15Roeland Jago Douma2019-07-271-1/+1
|\ \ | | | | | | [stable15] Change send to sent
| * | Change send to sentFrederic Werner2019-07-261-1/+1
| |/ | | | | | | Signed-off-by: Frederic Werner <frederic-github@werner-net.work>
* / [tx-robot] updated from transifexNextcloud bot2019-07-27126-212/+218
|/
* Merge pull request #16549 from ↵Roeland Jago Douma2019-07-261-17/+3
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/stable15/fstream-1.0.12 [Security] Bump fstream from 1.0.11 to 1.0.12 in /settings
| * [Security] Bump fstream from 1.0.11 to 1.0.12 in /settingsdependabot-preview[bot]2019-07-261-17/+3
|/ | | | | | | Bumps [fstream](https://github.com/npm/fstream) from 1.0.11 to 1.0.12. **This update includes a security fix.** - [Release notes](https://github.com/npm/fstream/releases) - [Commits](https://github.com/npm/fstream/compare/v1.0.11...v1.0.12) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Merge pull request #16548 from ↵Roeland Jago Douma2019-07-261-17/+3
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/stable15/fstream-1.0.12 [Security] Bump fstream from 1.0.11 to 1.0.12 in /build
| * [Security] Bump fstream from 1.0.11 to 1.0.12 in /builddependabot-preview[bot]2019-07-261-17/+3
| | | | | | | | | | | | | | Bumps [fstream](https://github.com/npm/fstream) from 1.0.11 to 1.0.12. **This update includes a security fix.** - [Release notes](https://github.com/npm/fstream/releases) - [Commits](https://github.com/npm/fstream/compare/v1.0.11...v1.0.12) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | [tx-robot] updated from transifexNextcloud bot2019-07-2612-54/+56
|/
* Merge pull request #16537 from nextcloud/backport/16503/stable15Roeland Jago Douma2019-07-251-0/+5
|\ | | | | [stable15] allow to provide supported calendar component set internally as a string
| * allow to provide supported calendar component set internally as a stringGeorg Ehrke2019-07-251-0/+5
|/ | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* [tx-robot] updated from transifexNextcloud bot2019-07-2514-12/+50
|
* [tx-robot] updated from transifexNextcloud bot2019-07-244-0/+6
|
* [tx-robot] updated from transifexNextcloud bot2019-07-238-2/+22
|
* [tx-robot] updated from transifexNextcloud bot2019-07-2234-72/+104
|
* [tx-robot] updated from transifexNextcloud bot2019-07-2160-154/+316
|
* [tx-robot] updated from transifexNextcloud bot2019-07-2018-12/+46
|
* [tx-robot] updated from transifexNextcloud bot2019-07-1960-4/+90
|
* Merge pull request #16445 from nextcloud/backport/16440/stable15Roeland Jago Douma2019-07-181-4/+4
|\ | | | | [stable15] Fix File#putContents(string) on ObjectStorage
| * Fix File#putContents(string) on ObjectStorageMarcel Klehr2019-07-171-4/+4
| | | | | | | | Signed-off-by: Marcel Klehr <mklehr@gmx.net>
* | [tx-robot] updated from transifexNextcloud bot2019-07-18290-286/+314
|/
* Merge pull request #16433 from nextcloud/backport/16424/stable15Roeland Jago Douma2019-07-171-1/+6
|\ | | | | [stable15] Do not keep searching for recent
| * Do not keep searching for recentRoeland Jago Douma2019-07-171-1/+6
|/ | | | | | | | | | | | | | | | | | | If userA has a lot of recent files. But only shares 1 file with userB (that has no files at all). We could keep searching until we run out of recent files for userA. Now assume the inactive userB has 20 incomming shares like that from different users. getRecent then basically keeps consuming huge amounts of resources and with each iteration the load on the DB increases (because of the offset). This makes sure we do not get more than 3 times the limit we search for or more than 5 queries. This means we might miss some recent entries but we should fix that separatly. This is just to make sure the load on the DB stays sane. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2019-07-1758-102/+108
|
* Merge pull request #16426 from nextcloud/backport/16423/stable15Roeland Jago Douma2019-07-162-18/+28
|\ | | | | [stable15] Only prevent disabling encrytion via the API
| * Only prevent disabling encrytion via the APIJoas Schilling2019-07-162-18/+28
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2019-07-166-118/+126
|
* [tx-robot] updated from transifexNextcloud bot2019-07-154-8/+8
|
* [tx-robot] updated from transifexNextcloud bot2019-07-1424-44/+106
|
* [tx-robot] updated from transifexNextcloud bot2019-07-1320-4/+34
|
* [tx-robot] updated from transifexNextcloud bot2019-07-1270-146/+294
|
* Merge pull request #16348 from ↵Morris Jobke2019-07-111-3/+3
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/stable15/lodash-4.17.14 [Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/accessibility
| * [Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/accessibilitydependabot-preview[bot]2019-07-111-3/+3
| | | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #16351 from ↵Morris Jobke2019-07-111-3/+3
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/stable15/lodash-4.17.14 [Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/updatenotification
| * | [Security] Bump lodash in /apps/updatenotificationdependabot-preview[bot]2019-07-111-3/+3
| |/ | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #16357 from ↵Morris Jobke2019-07-111-3/+3
|\ \ | |/ |/| | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/stable15/lodash-4.17.14 [Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/oauth2
| * [Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/oauth2dependabot-preview[bot]2019-07-111-3/+3
| | | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #16350 from ↵Morris Jobke2019-07-112-4/+4
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/stable15/lodash-4.17.13 [Security] Bump lodash from 4.17.11 to 4.17.13 in /settings
| * | [Security] Bump lodash from 4.17.11 to 4.17.13 in /settingsdependabot-preview[bot]2019-07-112-4/+4
| |/ | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #16345 from ↵Morris Jobke2019-07-111-3/+3
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/stable15/lodash.merge-4.6.2 [Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /settings
| * | [Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /settingsdependabot-preview[bot]2019-07-111-3/+3
| |/ | | | | | | | | | | | | Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #16344 from ↵Morris Jobke2019-07-111-3/+3
|\ \ | |/ |/| | | | | nextcloud/dependabot/npm_and_yarn/settings/stable15/lodash.mergewith-4.6.2 [Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /settings
| * [Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /settingsdependabot-preview[bot]2019-07-101-3/+3
| | | | | | | | | | | | | | Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #16346 from ↵Morris Jobke2019-07-111-3/+3
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/stable15/lodash.mergewith-4.6.2 [Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /build
| * | [Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /builddependabot-preview[bot]2019-07-101-3/+3
| |/ | | | | | | | | | | | | Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #16353 from ↵Roeland Jago Douma2019-07-111-3/+3
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/stable15/lodash-4.17.14 [Security] Bump lodash from 4.17.11 to 4.17.14 in /build
| * | [Security] Bump lodash from 4.17.11 to 4.17.14 in /builddependabot-preview[bot]2019-07-111-3/+3
|/ / | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | [Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /apps/upda… (#16339)John Molakvoæ2019-07-111-3/+3
|\ \ | | | | | | [Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /apps/updatenotification
| * | [Security] Bump lodash.merge in /apps/updatenotificationdependabot-preview[bot]2019-07-101-3/+3
| |/ | | | | | | | | | | | | Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>