summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix the system address bookRoeland Jago Douma2018-12-041-7/+8
| | | | | | | | c23a66cda46d9a1f0ce8dc60a6c160809c87d9f6 broke the system address book. We now move the ACL rules for this special case up and all is good in the world again. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2018-12-0434-70/+64
|
* [tx-robot] updated from transifexNextcloud bot2018-12-038-0/+16
|
* [tx-robot] updated from transifexNextcloud bot2018-12-0234-0/+102
|
* [tx-robot] updated from transifexNextcloud bot2018-12-0120-0/+32
|
* [tx-robot] updated from transifexNextcloud bot2018-11-30148-182/+440
|
* [tx-robot] updated from transifexNextcloud bot2018-11-2996-434/+2336
|
* [tx-robot] updated from transifexNextcloud bot2018-11-288-48/+776
|
* [tx-robot] updated from transifexNextcloud bot2018-11-2730-34/+188
|
* [tx-robot] updated from transifexNextcloud bot2018-11-2624-2/+242
|
* [tx-robot] updated from transifexNextcloud bot2018-11-2518-28/+64
|
* [tx-robot] updated from transifexNextcloud bot2018-11-24114-194/+222
|
* Merge pull request #12595 from nextcloud/backport/12448/stable13Morris Jobke2018-11-232-3/+2
|\ | | | | [stable13] Load apps that have a dav type set before the dav server plugins
| * Load apps that have a dav type set before the dav server pluginsJulius Härtl2018-11-222-3/+2
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #12616 from nextcloud/backport/12592/stable13Roeland Jago Douma2018-11-231-1/+1
|\ \ | | | | | | [stable13] fix typo in original english string and all translations
| * | fix typo in original english string and all translationsPatrick Baber2018-11-221-1/+1
| |/ | | | | | | Signed-off-by: Patrick Baber <patrick@p-squared.de>
* / [tx-robot] updated from transifexNextcloud bot2018-11-231230-17864/+5432
|/
* Merge pull request #12585 from nextcloud/version/noid/13.0.8v13.0.8Morris Jobke2018-11-221-2/+2
|\ | | | | 13.0.8
| * 13.0.8Morris Jobke2018-11-221-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2018-11-226-0/+30
|
* Merge pull request #12562 from nextcloud/backport/12544/stable13Roeland Jago Douma2018-11-211-0/+4
|\ | | | | [13] Handle permission in update of share better
| * Handle permission in update of share betterRoeland Jago Douma2018-11-201-0/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-11-2112-0/+34
|/
* Merge pull request #12546 from nextcloud/backport/12543/stable13Julius Härtl2018-11-201-0/+4
|\ | | | | [stable13] Bearer tokens are app token
| * Bearer tokens are app tokenRoeland Jago Douma2018-11-201-0/+4
|/ | | | | | | | | | Fixes #12498 This means that we set that it is a proper app token once it is validated. This will allow the 2FA middleware to just run the same check. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #12532 from nextcloud/version/noid/13.0.8rc2v13.0.8RC2Morris Jobke2018-11-201-2/+2
|\ | | | | 13.0.8 RC 2
| * 13.0.8 RC 2Morris Jobke2018-11-191-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-11-20108-208/+256
|/
* Merge pull request #12503 from nextcloud/swift-object-not-found-13Morris Jobke2018-11-193-8/+25
|\ | | | | [13] forward object not found error in swift as dav 404
| * forward object not found error in swift as dav 404Robin Appelman2018-11-193-8/+25
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-11-198-0/+70
| |
* | [tx-robot] updated from transifexNextcloud bot2018-11-1838-2/+370
| |
* | [tx-robot] updated from transifexNextcloud bot2018-11-17376-3428/+3440
|/
* [tx-robot] updated from transifexNextcloud bot2018-11-1632-2/+92
|
* Merge pull request #12437 from nextcloud/version/noid/13.0.8RC1v13.0.8RC1Morris Jobke2018-11-151-2/+2
|\ | | | | 13.0.8 RC 1
| * 13.0.8 RC 1Morris Jobke2018-11-151-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #12460 from nextcloud/bugfix-stable13/dav_shares_hickupMorris Jobke2018-11-154-32/+36
|\ | | | | [stable13] fixes dav share issue with owner
| * fix caldav testsGeorg Ehrke2018-11-152-18/+18
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * fixes dav share issue with ownerGeorg Ehrke2018-11-142-14/+18
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | [tx-robot] updated from transifexNextcloud bot2018-11-1552-86/+576
|/
* [tx-robot] updated from transifexNextcloud bot2018-11-1418-6/+614
|
* Merge pull request #12376 from nextcloud/backport/12284/stable13Roeland Jago Douma2018-11-131-1/+1
|\ | | | | [13] Properly search the root of a shared external storage
| * Properly search the root of a shared external storageRoeland Jago Douma2018-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fixes #1020 When an external storage is shared with you in full the root is '' (empty). This adds an extra check for an empty jail basically. Because if the jail is on the empty string. It matches all paths. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12434 from ↵Morris Jobke2018-11-132-8/+30
|\ \ | | | | | | | | | | | | nextcloud/backport/12411-12413/unique-constraint-fix-13 [stable13] Unique contraint and deadlock fixes for filecache and file_locks
| * | Fix UniqueConstraintViolationException while insert into oc_file_locksMorris Jobke2018-11-131-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #9305 by not being prone to the race condition in insertIfNotExists * fixes #6899 by not using a query that can result in a deadlock * replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block * followup to #12371 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Fix UniqueConstraintViolationException while insert into oc_filecacheMorris Jobke2018-11-131-7/+18
|/ / | | | | | | | | | | | | | | * fixes #6160 by not being prone to the race condition in insertIfNotExists * fixes #12228 by not using a query that can result in a deadlock * replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-11-13256-288/+336
| |
* | [tx-robot] updated from transifexNextcloud bot2018-11-1214-2/+46
| |
* | [tx-robot] updated from transifexNextcloud bot2018-11-1110-4/+28
| |
* | [tx-robot] updated from transifexNextcloud bot2018-11-10122-444/+506
|/