summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
* / [tx-robot] updated from transifexNextcloud bot2019-07-1134-56/+78
|/
* Merge pull request #16326 from nextcloud/backport/16308/stable15Roeland Jago Douma2019-07-102-27/+33
|\
| * Remove void for php7.0Daniel Kesselberg2019-07-101-1/+1
| * Return first value from $usersDaniel Kesselberg2019-07-102-27/+33
|/
* [tx-robot] updated from transifexNextcloud bot2019-07-108-0/+8
* Merge pull request #16304 from nextcloud/version/noid/15.0.10v15.0.10Morris Jobke2019-07-091-2/+2
|\
| * 15.0.10Morris Jobke2019-07-091-2/+2
|/
* [tx-robot] updated from transifexNextcloud bot2019-07-0940-34/+22
* Merge pull request #16283 from nextcloud/backport/15992/stable15Morris Jobke2019-07-081-1/+1
|\
| * Properly load permissions in showActionsJulius Härtl2019-07-071-1/+1
* | [tx-robot] updated from transifexNextcloud bot2019-07-0816-2/+18
|/
* [stable15] fix permissions for drag-n-drop uploads (#16250)John Molakvoæ2019-07-071-1/+1
|\
| * fix permissions for drag-n-drop uploadsRobin Appelman2019-07-051-1/+1
* | [tx-robot] updated from transifexNextcloud bot2019-07-0786-114/+186
* | [tx-robot] updated from transifexNextcloud bot2019-07-066-2/+20
|/
* [tx-robot] updated from transifexNextcloud bot2019-07-0524-6/+280
* Merge pull request #16190 from nextcloud/backport/16183/stable15Roeland Jago Douma2019-07-041-2/+3
|\
| * Do not fail hard on new user mail errorJohn Molakvoæ (skjnldsv)2019-07-021-2/+3
* | Merge pull request #16192 from nextcloud/backport/16024/stable15Roeland Jago Douma2019-07-041-1/+8
|\ \
| * | Forward OCSException to initiatorDaniel Kesselberg2019-07-021-1/+8
| |/
* | Merge pull request #16219 from nextcloud/version/noid/15.0.9v15.0.9Roeland Jago Douma2019-07-041-2/+2
|\ \
| * | 15.0.9Morris Jobke2019-07-031-2/+2
* | | [tx-robot] updated from transifexNextcloud bot2019-07-04132-124/+168
|/ /
* | Merge pull request #16215 from nextcloud/backport/16186/stable15Morris Jobke2019-07-035-188/+115
|\ \
| * | Remove duplicate testsJoas Schilling2019-07-031-144/+0
| * | Unify the permission checking in one place onlyJoas Schilling2019-07-034-46/+32
| * | Better check reshare permissions when creating a shareJoas Schilling2019-07-033-3/+88
* | | Merge pull request #16212 from nextcloud/backport/notfications/stable15Roeland Jago Douma2019-07-031-1/+1
|\ \ \ | |/ / |/| |
| * | Fix notification castingRoeland Jago Douma2019-07-031-1/+1
|/ /
* | Merge pull request #16202 from nextcloud/backport/16199/stable15Morris Jobke2019-07-032-3/+20
|\ \
| * | RefreshWebcalJob: replace ugly Regex with standard php utilsGeorg Ehrke2019-07-022-3/+20
| |/
* / [tx-robot] updated from transifexNextcloud bot2019-07-0344-18/+134
|/
* [tx-robot] updated from transifexNextcloud bot2019-07-02166-290/+332
* [tx-robot] updated from transifexNextcloud bot2019-07-012-0/+2
* [tx-robot] updated from transifexNextcloud bot2019-06-304-4/+44
* Merge pull request #16063 from nextcloud/version/15.0.9/RC1v15.0.9RC1Roeland Jago Douma2019-06-291-2/+2
|\