summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16565 from nextcloud/backport/16555/stable15Roeland Jago Douma2019-07-272-4/+7
|\
| * treat sensitive config keys by patternArthur Schiwon2019-07-262-4/+7
* | Merge pull request #16568 from nextcloud/backport/16163/stable15Roeland Jago Douma2019-07-271-1/+1
|\ \
| * | Change send to sentFrederic Werner2019-07-261-1/+1
| |/
* / [tx-robot] updated from transifexNextcloud bot2019-07-27126-212/+218
|/
* Merge pull request #16549 from nextcloud/dependabot/npm_and_yarn/settings/sta...Roeland Jago Douma2019-07-261-17/+3
|\
| * [Security] Bump fstream from 1.0.11 to 1.0.12 in /settingsdependabot-preview[bot]2019-07-261-17/+3
|/
* Merge pull request #16548 from nextcloud/dependabot/npm_and_yarn/build/stable...Roeland Jago Douma2019-07-261-17/+3
|\
| * [Security] Bump fstream from 1.0.11 to 1.0.12 in /builddependabot-preview[bot]2019-07-261-17/+3
* | [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
|\
| * allow to provide supported calendar component set internally as a stringGeorg Ehrke2019-07-251-0/+5
|/
* [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
|\
| * Fix File#putContents(string) on ObjectStorageMarcel Klehr2019-07-171-4/+4
* | [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
|\
| * Do not keep searching for recentRoeland Jago Douma2019-07-171-1/+6
|/
* [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
|\
| * Only prevent disabling encrytion via the APIJoas Schilling2019-07-162-18/+28
|/
* [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 nextcloud/dependabot/npm_and_yarn/apps/accessi...Morris Jobke2019-07-111-3/+3
|\
| * [Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/accessibilitydependabot-preview[bot]2019-07-111-3/+3
* | Merge pull request #16351 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Morris Jobke2019-07-111-3/+3
|\ \
| * | [Security] Bump lodash in /apps/updatenotificationdependabot-preview[bot]2019-07-111-3/+3
| |/
* | Merge pull request #16357 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Morris Jobke2019-07-111-3/+3
|\ \ | |/ |/|
| * [Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/oauth2dependabot-preview[bot]2019-07-111-3/+3
* | Merge pull request #16350 from nextcloud/dependabot/npm_and_yarn/settings/sta...Morris Jobke2019-07-112-4/+4
|\ \
| * | [Security] Bump lodash from 4.17.11 to 4.17.13 in /settingsdependabot-preview[bot]2019-07-112-4/+4
| |/
* | Merge pull request #16345 from nextcloud/dependabot/npm_and_yarn/settings/sta...Morris Jobke2019-07-111-3/+3
|\ \
| * | [Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /settingsdependabot-preview[bot]2019-07-111-3/+3
| |/
* | Merge pull request #16344 from nextcloud/dependabot/npm_and_yarn/settings/sta...Morris Jobke2019-07-111-3/+3
|\ \ | |/ |/|
| * [Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /settingsdependabot-preview[bot]2019-07-101-3/+3
* | Merge pull request #16346 from nextcloud/dependabot/npm_and_yarn/build/stable...Morris Jobke2019-07-111-3/+3
|\ \
| * | [Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /builddependabot-preview[bot]2019-07-101-3/+3
| |/
* | Merge pull request #16353 from nextcloud/dependabot/npm_and_yarn/build/stable...Roeland Jago Douma2019-07-111-3/+3
|\ \
| * | [Security] Bump lodash from 4.17.11 to 4.17.14 in /builddependabot-preview[bot]2019-07-111-3/+3
|/ /
* | [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 in /apps/updatenotificationdependabot-preview[bot]2019-07-101-3/+3
| |/