summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix indentationLukas Reschke2015-05-271-25/+25
* Merge pull request #16527 from owncloud/end-processing-when-404Morris Jobke2015-05-271-0/+1
|\
| * End processing when file is not foundLukas Reschke2015-05-221-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-274-6/+6
* | Merge pull request #15985 from owncloud/hotfix/fix-encryption-referencesBjörn Schießle2015-05-264-31/+2
|\ \
| * | removing encryption preview checkClark Tomlinson2015-05-181-3/+0
| * | removing deletion of encryption keysClark Tomlinson2015-05-181-26/+0
| * | fix references to legacy encryption app nameClark Tomlinson2015-05-184-4/+4
* | | Merge pull request #16565 from owncloud/add-urandom-checkThomas Müller2015-05-264-4/+50
|\ \ \
| * | | Add check for availability of /dev/urandomLukas Reschke2015-05-264-4/+50
* | | | Merge pull request #16519 from owncloud/example-themeJan-Christoph Borchardt2015-05-2613-7/+207
|\ \ \ \
| * | | | add example themeJan-Christoph Borchardt2015-05-2213-7/+207
* | | | | Merge pull request #16563 from owncloud/revert-16562-revert-15203-revert-1520...Thomas Müller2015-05-261-5/+0
|\ \ \ \ \
| * | | | | Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de"""Thomas Müller2015-05-261-5/+0
|/ / / / /
* | | | | Merge pull request #16562 from owncloud/revert-15203-revert-15201-webdav-ng-b...Oliver Kohl D.Sc.2015-05-261-0/+5
|\ \ \ \ \
| * | | | | Revert "Revert "FIX for webdav.mediencenter.t-online.de""Oliver Kohl D.Sc2015-05-261-0/+5
|/ / / / /
* | | | | Merge pull request #16521 from owncloud/unbold-placeholder-imageVincent Petry2015-05-261-1/+1
|\ \ \ \ \
| * | | | | use normal font weight instead of bold for image placeholdersJan-Christoph Borchardt2015-05-221-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #16561 from owncloud/add-default-timeout-backBjörn Schießle2015-05-262-3/+80
|\ \ \ \ \
| * | | | | Add connection timeout to default POST optionsLukas Reschke2015-05-262-3/+80
| | |_|/ / | |/| | |
* | | | | Merge pull request #16515 from owncloud/deprecate-useless-helper-classVincent Petry2015-05-262-1/+5
|\ \ \ \ \
| * | | | | Deprecate useless helper classLukas Reschke2015-05-212-1/+5
* | | | | | Merge pull request #16518 from owncloud/external-link-arrowVincent Petry2015-05-261-1/+1
|\ \ \ \ \ \
| * | | | | | use arrow icon for external link to Apps dev docs, like in Help sectionJan-Christoph Borchardt2015-05-221-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #16520 from owncloud/fix-float-spinner-positionVincent Petry2015-05-261-1/+4
|\ \ \ \ \ \
| * | | | | | fix float spinner positionJan-Christoph Borchardt2015-05-221-1/+4
| |/ / / / /
* | | | | | Merge pull request #16532 from owncloud/cors-no-cookie-authVincent Petry2015-05-264-13/+118
|\ \ \ \ \ \
| * | | | | | disallow cookie auth for cors requestsBernhard Posselt2015-05-224-13/+118
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #16452 from owncloud/enc_ftp_uploadBjörn Schießle2015-05-263-12/+114
|\ \ \ \ \ \
| * | | | | | flush() comments + perf optjknockaert2015-05-261-5/+7
| * | | | | | fix calculation of $count, $count is always 8129 so we need to check thisjknockaert2015-05-211-1/+1
| * | | | | | test to simulate a non-seekable stream wrapperBjoern Schiessle2015-05-213-9/+102
| * | | | | | encrypted filesize calculation in flush()jknockaert2015-05-211-1/+8
* | | | | | | Merge pull request #16339 from owncloud/master-override-channelThomas Müller2015-05-263-2/+80
|\ \ \ \ \ \ \
| * | | | | | | Test overriding channelVictor Dubiniuk2015-05-151-0/+47
| * | | | | | | Allow change update channel via public APIVictor Dubiniuk2015-05-132-2/+33
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-268-4/+18
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2512-10/+16
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2422-14/+252
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2326-2/+64
* | | | | | | | Merge pull request #16536 from rullzer/unit_tests_16511Bernhard Posselt2015-05-221-0/+80
|\ \ \ \ \ \ \ \
| * | | | | | | | Unit tests for #16511Roeland Jago Douma2015-05-221-0/+80
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #16526 from owncloud/enc_fix_versions_webdav_uploadVincent Petry2015-05-223-2/+25
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | remove part file extension before we read a filekey to reuse a existing key i...Bjoern Schiessle2015-05-223-2/+25
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #16493 from owncloud/cache-movewithcorrectmimetypeVincent Petry2015-05-222-8/+20
|\ \ \ \ \ \ \
| * | | | | | | Get correct mimetype when moving and changing extensionVincent Petry2015-05-212-8/+20
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #16516 from owncloud/fix-phpdoc-traitJoas Schilling2015-05-225-4/+16
|\ \ \ \ \ \ \
| * | | | | | | Fix PHPDocLukas Reschke2015-05-225-4/+16
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2232-0/+82
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #16499 from owncloud/fix-phpdoc-annotationsLukas Reschke2015-05-211-1/+1
|\ \ \ \ \ \