summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 11.0.3RC2v11.0.3RC2Lukas Reschke2017-04-181-2/+2
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* [tx-robot] updated from transifexNextcloud bot2017-04-1854-42/+296
|
* [tx-robot] updated from transifexNextcloud bot2017-04-1738-344/+448
|
* [tx-robot] updated from transifexNextcloud bot2017-04-1628-346/+624
|
* [tx-robot] updated from transifexNextcloud bot2017-04-1572-424/+632
|
* [tx-robot] updated from transifexNextcloud bot2017-04-14226-742/+1188
|
* [tx-robot] updated from transifexNextcloud bot2017-04-13174-836/+902
|
* [tx-robot] updated from transifexNextcloud bot2017-04-1262-26/+244
|
* Merge pull request #4301 from nextcloud/stable11-shared_by_for_own_calendarsLukas Reschke2017-04-112-0/+8
|\ | | | | [stable11] fix bug with shared_by for own calendars if shared
| * fix bug with shared_by for own calendars if sharedGeorg Ehrke2017-04-112-0/+8
|/ | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* Merge pull request #4290 from nextcloud/stable11-maintenance-mode-also-on-davMorris Jobke2017-04-111-0/+3
|\ | | | | Add missing maintenance plugin to new DAV endpoint
| * Add missing maintenance plugin to new DAV endpointLukas Reschke2017-04-111-0/+3
| | | | | | | | | | | | The `/remote.php/dav/` endpoint was not implementing the MaintenancePlugin. Thus when the instance was put into maintenance mode the endpoints were still accessible and delivered empty content. Sync clients really do love this. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | [tx-robot] updated from transifexNextcloud bot2017-04-11110-990/+382
|/
* Merge pull request #4278 from nextcloud/permissions-mask-scanner-11v11.0.3RC1Morris Jobke2017-04-102-0/+16
|\ | | | | Dont use the permissions mask while scanning
| * Dont use the permissions mask while scanningRobin Appelman2017-04-102-0/+16
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #4251 from nextcloud/add-share-by-mail-capabilitiesMorris Jobke2017-04-103-3/+90
|\ \ | |/ |/| add capabilities for share by mail
| * add capabilities for share by mailBjoern Schiessle2017-04-103-3/+90
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #4272 from ↵Lukas Reschke2017-04-108-7/+280
|\ \ | | | | | | | | | | | | nextcloud/stable11-fix_missing_owner_on_public_calendars [stable11] don't remove owner property for public calendars
| * | don't remove owner property for public calendarsGeorg Ehrke2017-04-108-7/+280
|/ / | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | [tx-robot] updated from transifexNextcloud bot2017-04-1022-14/+122
| |
* | [tx-robot] updated from transifexNextcloud bot2017-04-0968-22/+476
| |
* | [tx-robot] updated from transifexNextcloud bot2017-04-08202-1208/+768
| |
* | Merge pull request #4254 from nextcloud/stable11-4253Roeland Jago Douma2017-04-071-5/+10
|\ \ | |/ |/| [stable11] make JobList::next() lock free
| * make JobList::next() lock freeJörn Friedrich Dreyer2017-04-071-5/+10
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4230 from nextcloud/stable11-increase-versionRoeland Jago Douma2017-04-072-3/+3
|\ | | | | [stable11] Increase to 11.0.3 RC1
| * Fix testLukas Reschke2017-04-061-1/+1
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * [stable11] Increase to 11.0.3 RC1Lukas Reschke2017-04-051-2/+2
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | [tx-robot] updated from transifexNextcloud bot2017-04-0746-68/+244
| |
* | Merge pull request #4234 from ↵Morris Jobke2017-04-067-452/+371
|\ \ | | | | | | | | | | | | nextcloud/backport-4066-always-fix-broken-dav-values [stable11] Directly fix invalid values of DTEND and DTSTART
| * | Directly fix the valuesJoas Schilling2017-04-067-452/+371
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4235 from ↵Morris Jobke2017-04-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport-3857-legacy-caldav-endpoint-email-invitations [stable11] Fix scheduling plugin on legacy caldav endpoint
| * | | Fix scheduling plugin on legacy caldav endpointJoas Schilling2017-04-061-1/+1
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4236 from ↵Morris Jobke2017-04-062-3/+7
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport-3827-remove-double-password-confirmation [stable11] Remove the double password confirmation on changing cron
| * | | Remove the double password confirmation on changing cronJoas Schilling2017-04-062-3/+7
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4238 from nextcloud/4094-stable11Joas Schilling2017-04-061-2/+2
|\ \ \ | | | | | | | | [stable11] Fix LDAP description
| * | | Fix LDAP descriptionMarius Blüm2017-04-061-2/+2
| |/ / | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | Merge pull request #4237 from ↵Joas Schilling2017-04-061-5/+13
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport-3781-log-spam-with-external-storages [stable11] Also add the root of external storages to the file id list
| * | | Also add the root of external storages to the file id listJoas Schilling2017-04-061-5/+13
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4242 from nextcloud/encryption-fix-mail-share-stable11Joas Schilling2017-04-061-3/+3
|\ \ \ | | | | | | | | [stable11] take share by mail into consideration if we calculate the access list
| * | | take share by mail into consideration if we calculate the access listBjoern Schiessle2017-04-061-3/+3
| |/ / | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #4225 from nextcloud/stable11-token-save-scopeJoas Schilling2017-04-067-93/+292
|\ \ \ | | | | | | | | [Stable11] token save scope
| * | | Add integration tests for token authLukas Reschke2017-04-052-36/+172
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Save the scope of an auth token in the sessionRobin Appelman2017-04-055-57/+120
| | |/ | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4233 from ↵Joas Schilling2017-04-061-1/+30
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/backport-4071-database-conversion-failure [stable11] Make sure blob columns are correctly converted as parameters
| * | Use false because null crashes the cacheJoas Schilling2017-04-061-3/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Make sure blob columns are correctly converted as parametersJoas Schilling2017-04-061-1/+24
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4154 from nextcloud/stable11-4153Joas Schilling2017-04-061-1/+2
|\ \ | | | | | | [stable11] Fix upload of folders in Chrome
| * | Fix upload of folders in ChromeMorris Jobke2017-04-061-1/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4229 from ↵Morris Jobke2017-04-064-17/+61
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable11-dont-list-on-public-calendar-endpoint [stable11] Don't list on public calendar endpoints
| * | | Don't list on public calendar endpointsLukas Reschke2017-04-054-17/+61
| | |/ | |/| | | | | | | | | | | | | There is no need to allow listing here. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>