summaryrefslogtreecommitdiffstats
Commit message (Expand)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 RC3Lukas Reschke2017-02-201-2/+2
* | Merge pull request #3560 from nextcloud/fix-misleading-wording-stable11Lukas Reschke2017-02-211-1/+1
|\ \
| * | Fix misleading wording: searching is affected, not user access.Arthur Schiwon2017-02-201-1/+1
| |/
* / [tx-robot] updated from transifexNextcloud bot2017-02-2158-106/+244
|/
* Merge pull request #3528 from nextcloud/backport-3521Lukas Reschke2017-02-2020-43/+895
|\
| * also adjust version no in unit testsArthur Schiwon2017-02-201-6/+6
| * Backport of Fix Broken UUID Attribute Detection #3521Arthur Schiwon2017-02-1720-43/+895
* | [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
* Merge pull request #3519 from nextcloud/final-stable11-versionLukas Reschke2017-02-171-2/+2
|\
| * 11.0.2 version numberLukas Reschke2017-02-171-2/+2
|/
* Bump minor versionLukas Reschke2017-02-171-1/+1
* Merge pull request #3512 from nextcloud/beta2-it-isLukas Reschke2017-02-161-2/+2
|\
| * RC2 it isLukas Reschke2017-02-161-2/+2
* | Merge pull request #3510 from nextcloud/backport-2704-stable11Lukas Reschke2017-02-161-9/+11
|\ \
| * | add title to backup codes print pageChristoph Wurst2017-02-161-0/+1
| * | print and close the new tab, not the current one when printing backup codesChristoph Wurst2017-02-161-9/+10
| |/
* | Merge pull request #3511 from nextcloud/backport-3362-stable11Morris Jobke2017-02-162-3/+3
|\ \
| * | fix unit testsMorris Jobke2017-02-161-2/+2
| * | Fix cookie name (nc_token instead of oc_token)Christoph Wurst2017-02-161-1/+1
| |/
* | Merge pull request #3493 from nextcloud/backport-3324Morris Jobke2017-02-163-36/+85
|\ \
| * | LDAP's checkPassword should only catch when a user was not found, fixes #2431Arthur Schiwon2017-02-153-36/+85
* | | Merge pull request #3508 from nextcloud/nullstorage-free-space-11Morris Jobke2017-02-162-2/+4
|\ \ \ | |_|/ |/| |
| * | Fix unit testsMorris Jobke2017-02-161-1/+2
| * | return unknown free space from nullstorageRobin Appelman2017-02-161-1/+2
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-02-166-8/+16
* | Merge pull request #3499 from nextcloud/fix-addressbook-deletionMorris Jobke2017-02-154-3/+30
|\ \
| * | Address book data lost when any user receiving a share is deleted backportJohn Molakvoæ (skjnldsv)2017-02-154-3/+30
| |/
* | Merge pull request #3500 from nextcloud/stable11-3403Roeland Jago Douma2017-02-152-9/+9
|\ \
| * | Rename database password toggleMorris Jobke2017-02-152-9/+9
* | | Merge pull request #3494 from nextcloud/backport-3485Morris Jobke2017-02-151-4/+0
|\ \ \ | |_|/ |/| |
| * | Css fixJohn Molakvoæ (skjnldsv)2017-02-151-4/+0
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-02-1522-64/+354
* | Merge pull request #3481 from nextcloud/stable11-screensharing-iconMorris Jobke2017-02-145-0/+44
|\ \
| * | add screensharing iconJan-Christoph Borchardt2017-02-145-0/+44
|/ /
* | [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
|\ \
| * | Check if color exists in palette before using itVictor Dubiniuk2017-02-101-3/+3
| * | Make sure invalid images don't flood the log fileJoas Schilling2017-02-101-5/+5
* | | Merge pull request #3445 from nextcloud/stable11-add-integration-tests-for-davLukas Reschke2017-02-138-31/+90
|\ \ \
| * | | Add integration tests for legacy DAV endpointsLukas Reschke2017-02-108-31/+90
* | | | [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
| |_|/ |/| |