summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 15.0.9Morris Jobke2019-07-031-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2019-07-04132-124/+168
|/ /
* | Merge pull request #16215 from nextcloud/backport/16186/stable15Morris Jobke2019-07-035-188/+115
|\ \ | | | | | | [stable15] Better check reshare permissions part2
| * | Remove duplicate testsJoas Schilling2019-07-031-144/+0
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Unify the permission checking in one place onlyJoas Schilling2019-07-034-46/+32
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Better check reshare permissions when creating a shareJoas Schilling2019-07-033-3/+88
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #16212 from nextcloud/backport/notfications/stable15Roeland Jago Douma2019-07-031-1/+1
|\ \ \ | |/ / |/| | [stable15] Fix notification casting
| * | Fix notification castingRoeland Jago Douma2019-07-031-1/+1
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #16202 from nextcloud/backport/16199/stable15Morris Jobke2019-07-032-3/+20
|\ \ | | | | | | [stable15] RefreshWebcalJob: replace ugly Regex with standard php utils
| * | RefreshWebcalJob: replace ugly Regex with standard php utilsGeorg Ehrke2019-07-022-3/+20
| |/ | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* / [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
|\ | | | | 15.0.9 RC1
| * 15.0.9 RC1Roeland Jago Douma2019-06-281-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-06-2920-4/+20
|/
* Merge pull request #16142 from nextcloud/backport/16097/stable15Roeland Jago Douma2019-06-284-7/+291
|\ | | | | [stable15] Better check reshare permissions
| * Fix sharing testsRoeland Jago Douma2019-06-281-0/+230
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add integration test for increasing sub reshare permissionsDaniel Calviño Sánchez2019-06-282-0/+43
| | | | | | | | | | | | | | | | The tests check an user share and a link share; there is a slight difference in style between them as each one is based on the test above it, which tests increasing reshare permissions. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Do not create folders with admin userDaniel Calviño Sánchez2019-06-281-3/+5
| | | | | | | | | | | | | | | | | | | | The admin user is not deleted after each integration test is run, so folders created by the admin user in one test are still there when the next tests run; tests should be independent one from each other, so a regular user that is created and deleted for each test should be used instead. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Correctly check share permissions when updating a re-sub-shareJoas Schilling2019-06-281-4/+13
|/ | | | | | | | | | Before this change the node you shared was checked for permissions. This works when you reshare the folder that was shared with you. However when you reshared a subfolder (e.g. as public link), you could afterwards update the permissions and grant create+update permissions although the share you receive was read-only. Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #16134 from nextcloud/backport/16121/stable15Roeland Jago Douma2019-06-281-1/+1
|\ | | | | [stable15] Don't allow to disable encryption via the API
| * Don't allow to disable encryption via the APIJoas Schilling2019-06-271-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2019-06-2820-28/+54
|/
* Merge pull request #16126 from nextcloud/backport/16114/stable15Roeland Jago Douma2019-06-271-3/+5
|\ | | | | [stable15] Fix download link included in public share page with hidden download
| * Fix download link included in public share page with hidden downloadDaniel Calviño Sánchez2019-06-271-3/+5
| | | | | | | | | | | | | | | | The preview element in the public share page was always wrapped with a link to download the file; now that link is included only if the "Hide download" option of the share is not enabled. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #16129 from nextcloud/backport/16107/stable15Roeland Jago Douma2019-06-271-0/+21
|\ \ | |/ |/| [stable15] verify that paths are valid for recursive local move
| * verify that paths are valid for recursive local moveRobin Appelman2019-06-271-0/+21
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #16113 from nextcloud/backport/16101/stable15Roeland Jago Douma2019-06-273-7/+37
|\ | | | | [stable15] invalidates user when plugin reported deletion success
| * Also invalidate groups after deletionArthur Schiwon2019-06-271-2/+11
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * invalidates user when plugin reported deletion successArthur Schiwon2019-06-272-5/+26
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #16110 from nextcloud/backport/stable15/16011Roeland Jago Douma2019-06-273-20/+83
|\ \ | |/ |/| [stable15] (LDAP) API: return one base properly when multiple are configured
| * fixes return type in php docArthur Schiwon2019-06-271-1/+1
| | | | | | | | | | | | * the backend already expects and works with the string Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fixes returning the base when multiple are specifiedArthur Schiwon2019-06-272-19/+82
|/ | | | | | | | | | | * reading the config directly will return the value with line breaks * using the proper accessor gives us all bases in an array * returns the first matching one * having user id provided for the group base is strange and does not let us operate like this. here we return the first one. might change in future, a backportable fix won't have an API change however. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* [tx-robot] updated from transifexNextcloud bot2019-06-278-2/+36
|
* Merge pull request #16092 from nextcloud/backport/16027/stable15Roeland Jago Douma2019-06-261-1/+3
|\ | | | | [stable15] Check if uploading to lookup server is enabled before verifying
| * Check if uploading to lookup server is enabled before verifyingJoas Schilling2019-06-261-1/+3
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #16083 from nextcloud/backport/15832/stable15Roeland Jago Douma2019-06-262-2/+5
|\ \ | | | | | | [stable15] Fix full text search for groupfolders
| * | Fix full text search for groupfoldersMorris Jobke2019-06-252-2/+5
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #16090 from nextcloud/backport/16021/stable15Roeland Jago Douma2019-06-262-0/+6
|\ \ \ | |_|/ |/| | [stable15] Fall back to black for non-color values
| * | Fall back to black for non-color valuesJoas Schilling2019-06-262-0/+6
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #16081 from nextcloud/backport/15956/stable15Roeland Jago Douma2019-06-261-2/+2
|\ \ | | | | | | [stable15] Fix appid argument for integrity:check-app
| * | Fix appid argument for integrity:check-appGeorg Ehrke2019-06-251-2/+2
| |/ | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | [tx-robot] updated from transifexNextcloud bot2019-06-2610-2/+68
| |
* | Merge pull request #15927 from nextcloud/backport/stable15/15830Roeland Jago Douma2019-06-252-47/+45
|\ \ | |/ |/| [stable15] Show share settings only if incoming federated shares are allowed
| * Show share settings only if incoming federated shares are allowedMorris Jobke2019-06-112-47/+45
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #16030 from nextcloud/backport/15540/stable15Roeland Jago Douma2019-06-251-2/+3
|\ \ | | | | | | [stable15] Prevent faulty logs from nested setupFS calls
| * | Prevent faulty logs from nested setupFS callsJoas Schilling2019-06-211-2/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-06-2518-24/+152
| | |