aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /settingsdependabot-preview[bot]2019-07-101-3/+3
* [tx-robot] updated from transifexNextcloud bot2019-07-106-0/+6
* [tx-robot] updated from transifexNextcloud bot2019-07-0936-34/+18
* [tx-robot] updated from transifexNextcloud bot2019-07-074-0/+72
* [tx-robot] updated from transifexNextcloud bot2019-07-064-0/+8
* [tx-robot] updated from transifexNextcloud bot2019-07-0524-6/+280
* Merge pull request #16193 from nextcloud/backport/16024/stable14Roeland Jago Douma2019-07-041-1/+8
|\
| * Forward OCSException to initiatorDaniel Kesselberg2019-07-021-1/+8
* | Merge pull request #16220 from nextcloud/version/noid/14.0.13v14.0.13Roeland Jago Douma2019-07-041-2/+2
|\ \
| * | 14.0.13Morris Jobke2019-07-031-2/+2
* | | [tx-robot] updated from transifexNextcloud bot2019-07-04132-124/+168
|/ /
* | Merge pull request #16216 from nextcloud/backport/16186/stable14Morris Jobke2019-07-035-184/+115
|\ \
| * | Remove duplicate testsJoas Schilling2019-07-031-140/+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 #16213 from nextcloud/backport/notfications/stable14Morris Jobke2019-07-031-1/+1
|\ \ \ | |/ / |/| |
| * | Fix notification castingRoeland Jago Douma2019-07-031-1/+1
|/ /
* / [tx-robot] updated from transifexNextcloud bot2019-07-0342-8/+124
|/
* [tx-robot] updated from transifexNextcloud bot2019-07-02164-288/+320
* [tx-robot] updated from transifexNextcloud bot2019-07-012-0/+2
* [tx-robot] updated from transifexNextcloud bot2019-06-302-2/+36
* Merge pull request #16062 from nextcloud/version/noid/14.0.13RC1v14.0.13RC1Roeland Jago Douma2019-06-291-2/+2
|\
| * 14.0.13 RC1Roeland Jago Douma2019-06-281-2/+2
* | [tx-robot] updated from transifexNextcloud bot2019-06-2920-4/+20
|/
* Merge pull request #16143 from nextcloud/backport/16097/stable14Roeland Jago Douma2019-06-284-7/+212
|\
| * Update testsRoeland Jago Douma2019-06-281-0/+151
| * Add integration test for increasing sub reshare permissionsDaniel Calviño Sánchez2019-06-282-0/+43
| * Do not create folders with admin userDaniel Calviño Sánchez2019-06-281-3/+5
| * Correctly check share permissions when updating a re-sub-shareJoas Schilling2019-06-281-4/+13
|/
* Merge pull request #16135 from nextcloud/backport/16121/stable14Roeland Jago Douma2019-06-281-1/+1
|\
| * Don't allow to disable encryption via the APIJoas Schilling2019-06-271-1/+1
* | Merge pull request #16094 from nextcloud/backport/16027/check-if-uploading-is...Roeland Jago Douma2019-06-281-0/+9
|\ \
| * | Check if uploading to lookup server is enabled before verifyingJoas Schilling2019-06-261-0/+9
* | | [tx-robot] updated from transifexNextcloud bot2019-06-2818-26/+52
| |/ |/|
* | Merge pull request #16130 from nextcloud/backport/16107/stable14Roeland Jago Douma2019-06-271-0/+21
|\ \
| * | verify that paths are valid for recursive local moveRobin Appelman2019-06-271-0/+21
|/ /
* | [tx-robot] updated from transifexNextcloud bot2019-06-276-0/+24
* | Merge pull request #16096 from nextcloud/backport/16021/fall-back-to-black-fo...Roeland Jago Douma2019-06-261-1/+7
|\ \ | |/ |/|
| * Fall back to black for non-color valuesJoas Schilling2019-06-261-1/+7
|/
* [tx-robot] updated from transifexNextcloud bot2019-06-2610-2/+68
* Merge pull request #16031 from nextcloud/backport/15540/stable14Roeland Jago Douma2019-06-251-2/+3
|\
| * Prevent faulty logs from nested setupFS callsJoas Schilling2019-06-211-2/+3
* | [tx-robot] updated from transifexNextcloud bot2019-06-2510-16/+108
* | [tx-robot] updated from transifexNextcloud bot2019-06-2416-2/+106
* | [tx-robot] updated from transifexNextcloud bot2019-06-2318-2/+24
* | [tx-robot] updated from transifexNextcloud bot2019-06-222-0/+872
|/
* [tx-robot] updated from transifexNextcloud bot2019-06-2118-0/+46
* [tx-robot] updated from transifexNextcloud bot2019-06-204-0/+32
* [tx-robot] updated from transifexNextcloud bot2019-06-192-2/+68
* [tx-robot] updated from transifexNextcloud bot2019-06-184-4/+4