summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-02-2384-80/+172
|
* [tx-robot] updated from transifexNextcloud bot2017-02-2264-150/+326
|
* Merge pull request #3552 from nextcloud/rc3-it-isLukas Reschke2017-02-211-2/+2
|\ | | | | v11.0.2 RC3
| * v11.0.2 RC3Lukas Reschke2017-02-201-2/+2
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #3560 from nextcloud/fix-misleading-wording-stable11Lukas Reschke2017-02-211-1/+1
|\ \ | | | | | | [stable11] Fix misleading wording: searching is affected, not user access
| * | Fix misleading wording: searching is affected, not user access.Arthur Schiwon2017-02-201-1/+1
| |/ | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* / [tx-robot] updated from transifexNextcloud bot2017-02-2158-106/+244
|/
* Merge pull request #3528 from nextcloud/backport-3521Lukas Reschke2017-02-2020-43/+895
|\ | | | | [stable11] Backport of Fix Broken UUID Attribute Detection #3521
| * also adjust version no in unit testsArthur Schiwon2017-02-201-6/+6
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Backport of Fix Broken UUID Attribute Detection #3521Arthur Schiwon2017-02-1720-43/+895
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix integration test by not relying on Fake instances Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Fix determining the UUID attribute, default of the override is null Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> add integration test for uuid attr detection Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Add repair steps Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Background jobs can take 4k of characters only. We find a good batch size. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> add tests to DB group Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2017-02-202-0/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-02-196-2/+10
| |
* | [tx-robot] updated from transifexNextcloud bot2017-02-1818-20/+492
|/
* [tx-robot] updated from transifexNextcloud bot2017-02-176-4/+756
|
* Increase patchlevel to 4v11.0.2Lukas Reschke2017-02-171-1/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #3519 from nextcloud/final-stable11-versionLukas Reschke2017-02-171-2/+2
|\ | | | | 11.0.2 version number
| * 11.0.2 version numberLukas Reschke2017-02-171-2/+2
|/ | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Bump minor versionLukas Reschke2017-02-171-1/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #3512 from nextcloud/beta2-it-isLukas Reschke2017-02-161-2/+2
|\ | | | | RC2 it is
| * RC2 it isLukas Reschke2017-02-161-2/+2
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #3510 from nextcloud/backport-2704-stable11Lukas Reschke2017-02-161-9/+11
|\ \ | | | | | | [stable11] fix printing backup codes
| * | add title to backup codes print pageChristoph Wurst2017-02-161-0/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | print and close the new tab, not the current one when printing backup codesChristoph Wurst2017-02-161-9/+10
| |/ | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #3511 from nextcloud/backport-3362-stable11Morris Jobke2017-02-162-3/+3
|\ \ | | | | | | [stable11] Fix cookie name (nc_token instead of oc_token)
| * | fix unit testsMorris Jobke2017-02-161-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Fix cookie name (nc_token instead of oc_token)Christoph Wurst2017-02-161-1/+1
| |/ | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #3493 from nextcloud/backport-3324Morris Jobke2017-02-163-36/+85
|\ \ | | | | | | [stable11] LDAP's checkPassword should only catch when a user was not found
| * | LDAP's checkPassword should only catch when a user was not found, fixes #2431Arthur Schiwon2017-02-153-36/+85
| | | | | | | | | | | | | | | | | | Also fixes error processing after ldap_search, due to different return format Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #3508 from nextcloud/nullstorage-free-space-11Morris Jobke2017-02-162-2/+4
|\ \ \ | |_|/ |/| | [11] return unknown free space from nullstorage
| * | Fix unit testsMorris Jobke2017-02-161-1/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | return unknown free space from nullstorageRobin Appelman2017-02-161-1/+2
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-02-166-8/+16
| |
* | Merge pull request #3499 from nextcloud/fix-addressbook-deletionMorris Jobke2017-02-154-3/+30
|\ \ | | | | | | [stable11] Address book data lost when any user receiving a share is deleted backport
| * | Address book data lost when any user receiving a share is deleted backportJohn Molakvoæ (skjnldsv)2017-02-154-3/+30
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #3500 from nextcloud/stable11-3403Roeland Jago Douma2017-02-152-9/+9
|\ \ | | | | | | [stable11] Rename database password toggle
| * | Rename database password toggleMorris Jobke2017-02-152-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | * otherwise submitting the form with the password show will be overwritten * see https://github.com/nextcloud/server/blob/2c9d7eeb763d2f907eea8234f6c60a829a5d39f7/core/Controller/SetupController.php#L59 * seems to be a legacy fallback * fixes #3381 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3494 from nextcloud/backport-3485Morris Jobke2017-02-151-4/+0
|\ \ \ | |_|/ |/| | [stable11] Popovermenu files css fix
| * | Css fixJohn Molakvoæ (skjnldsv)2017-02-151-4/+0
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2017-02-1522-64/+354
| |
* | Merge pull request #3481 from nextcloud/stable11-screensharing-iconMorris Jobke2017-02-145-0/+44
|\ \ | | | | | | [stable11] add screensharing icon
| * | add screensharing iconJan-Christoph Borchardt2017-02-145-0/+44
|/ / | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2017-02-1468-206/+1094
| |
* | Merge pull request #3440 from nextcloud/backport-oc-26963v11.0.2RC1Lukas Reschke2017-02-131-8/+8
|\ \ | | | | | | [stable11] Make sure invalid images don't flood the log file
| * | Check if color exists in palette before using itVictor Dubiniuk2017-02-101-3/+3
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Make sure invalid images don't flood the log fileJoas Schilling2017-02-101-5/+5
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #3445 from nextcloud/stable11-add-integration-tests-for-davLukas Reschke2017-02-138-31/+90
|\ \ \ | | | | | | | | [stable11] Add integration tests for legacy DAV endpoints
| * | | Add integration tests for legacy DAV endpointsLukas Reschke2017-02-108-31/+90
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-1316-60/+248
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-1230-10/+314
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-11212-1336/+1732
| |_|/ |/| |