summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8259 from nextcloud/guzzle6Morris Jobke2018-02-1426-424/+411
|\
| * fix redundant namespaceRobin Appelman2018-02-121-1/+1
| * adjust post body for new guzzleRobin Appelman2018-02-091-0/+4
| * Adjust integration tests to new guzzleRobin Appelman2018-02-0917-350/+322
| * Adjust dav client to new guzzleRobin Appelman2018-02-091-2/+2
| * adjust httpclient to guzzle6Robin Appelman2018-02-097-73/+84
| * update guzzlehttp/guzzle to 6.3.0Robin Appelman2018-02-091-0/+0
* | Merge pull request #8335 from nextcloud/remove-unused-importMorris Jobke2018-02-1487-147/+0
|\ \
| * | Remove unused import statementsMorris Jobke2018-02-1487-147/+0
* | | Merge pull request #8328 from nextcloud/bugfix/noid/filter-out-the-current-us...Joas Schilling2018-02-141-2/+9
|\ \ \
| * | | Filter out the current user when searching for emails tooJoas Schilling2018-02-131-2/+9
* | | | Merge pull request #8337 from nextcloud/use-non-alias-methodJoas Schilling2018-02-148-11/+11
|\ \ \ \
| * | | | Use non aliased method insteadMorris Jobke2018-02-138-11/+11
| | |/ / | |/| |
* | | | Merge pull request #8338 from nextcloud/simplify-return-statementJoas Schilling2018-02-149-33/+13
|\ \ \ \
| * | | | Simplify return statementMorris Jobke2018-02-139-33/+13
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2018-02-1428-26/+278
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2018-02-13224-1380/+5372
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-02-12308-58/+9604
* | Merge pull request #8308 from nextcloud/public_link_wa_previewJoas Schilling2018-02-121-0/+11
|\ \
| * | Show open graph preview in WhatsAppRoeland Jago Douma2018-02-121-0/+11
* | | Merge pull request #8297 from nextcloud/bugfix/noid/fix-example-regex-for-use...Morris Jobke2018-02-121-1/+1
|\ \ \
| * | | Fix example regex for user agent matchingJoas Schilling2018-02-101-1/+1
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2018-02-09250-8838/+4978
|/ /
* | Merge pull request #6265 from nextcloud/unperl-l10nMorris Jobke2018-02-098-443/+132
|\ \
| * | Remove old perl script to update l10n filesMorris Jobke2018-02-088-443/+132
| |/
* | Merge pull request #8270 from nextcloud/revoke-files_rightclickMorris Jobke2018-02-091-9/+10
|\ \
| * | Update CRL to revoke files_rightclickMorris Jobke2018-02-091-9/+10
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-02-09136-346/+468
* | Merge pull request #8263 from nextcloud/fix_dev_man_linkMorris Jobke2018-02-083-6/+34
|\ \
| * | Link to NC 14 dev manualRoeland Jago Douma2018-02-083-6/+34
| |/
* | Merge pull request #8235 from nextcloud/swift-primairy-ciMorris Jobke2018-02-088-3/+62
|\ \ | |/ |/|
| * sleep moreRobin Appelman2018-02-081-1/+1
| * Try to silence phanRoeland Jago Douma2018-02-081-0/+3
| * don't swallow exception from touchRobin Appelman2018-02-082-2/+10
| * better error message on catalog errorRobin Appelman2018-02-082-1/+6
| * add ci for swift primary storageRobin Appelman2018-02-085-0/+43
|/
* Merge pull request #8033 from nextcloud/s3-uploaderMorris Jobke2018-02-082-48/+14
|\
| * Use S3Client::upload instead of splitting single/multipart upload ourselvesRobin Appelman2018-01-242-48/+14
* | Merge pull request #8100 from nextcloud/s3-folder-deleteMorris Jobke2018-02-081-7/+12
|\ \
| * | fix invalidating folder cache for s3Robin Appelman2018-01-291-1/+1
| * | adjust s3 bulk delete to new sdk syntaxRobin Appelman2018-01-291-6/+11
* | | Merge pull request #8218 from nextcloud/display_proper_lang_stringMorris Jobke2018-02-081-1/+1
|\ \ \
| * | | Display the proper language strings in setttingsRoeland Jago Douma2018-02-071-1/+1
* | | | Merge pull request #8252 from nextcloud/remove-wrong-documentation-linkJoas Schilling2018-02-081-1/+0
|\ \ \ \
| * | | | Remove invalid link to documentationMorris Jobke2018-02-081-1/+0
* | | | | Merge pull request #8214 from axllent/referrer-fixJoas Schilling2018-02-083-3/+3
|\ \ \ \ \
| * | | | | Referrer fix (no-referrer)Ralph Slooten2018-02-083-3/+3
* | | | | | Merge pull request #8023 from nextcloud/webdavsearch_limit_order_fixingMorris Jobke2018-02-084-57/+147
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | adjust testsRobin Appelman2018-02-071-17/+21
| * | | | | CacheJail should apply limit and offset after searchingRoeland Jago Douma2018-02-072-3/+10