summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5582 from owncloud/files-previewcachingThomas Müller2013-11-0511-47/+80
|\
| * Added missing comma to make the next diff cleanerVincent Petry2013-10-311-1/+1
| * Fixed preview URL + size while dragging an existing fileVincent Petry2013-10-282-3/+5
| * Append file etag to preview URLsVincent Petry2013-10-2810-44/+75
* | Merge pull request #5673 from owncloud/oc6-windows-server-mssql-masterThomas Müller2013-11-054-12/+7
|\ \
| * | Inherit lastInsertId() from Adapter.Andreas Fischer2013-11-041-5/+0
| * | adding test for binary file to test \OC_Helper::streamCopy()Thomas Mueller2013-11-041-0/+1
| * | ignore test filesThomas Mueller2013-11-041-0/+2
| * | WIN: fixing unit test for testStreamCopy()Thomas Mueller2013-11-021-1/+1
| * | WIN: fixing Fatal error: Call to a member function logicToPhysical() on a non...Thomas Mueller2013-11-021-4/+3
| * | mssql: fixing lastInsertId() implementationThomas Mueller2013-11-021-4/+2
* | | Merge pull request #5540 from owncloud/scanner-enhancments-masterThomas Müller2013-11-043-3/+21
|\ \ \
| * | | use ===Thomas Müller2013-11-041-1/+1
| * | | set log level to DEBUGThomas Müller2013-11-041-2/+4
| * | | using array_diff_assoc to detect diffs in values as wellThomas Müller2013-10-251-1/+1
| * | | cast storage_mtime to intThomas Müller2013-10-251-0/+1
| * | | adding storage_mtime handling to SharedCacheThomas Müller2013-10-251-0/+4
| * | | log the data arraysThomas Müller2013-10-241-1/+3
| * | | some logging added ....Thomas Müller2013-10-241-2/+11
* | | | Merge pull request #5683 from owncloud/no-coverage-with-php-v53-masterThomas Müller2013-11-041-1/+6
|\ \ \ \
| * | | | keep junit xml reportsThomas Müller2013-11-041-1/+1
| * | | | adding environment variable to control coverage reportingThomas Müller2013-11-041-1/+6
|/ / / /
* | | | Merge pull request #5544 from owncloud/fixing-3593-2-masterThomas Müller2013-11-042-1/+17
|\ \ \ \
| * | | | add header 'OC-FileId' on PUTThomas Müller2013-10-251-0/+16
| * | | | switch instance id and file idThomas Müller2013-10-251-1/+1
* | | | | Merge pull request #5656 from owncloud/fix-wizard-typoAndreas Fischer2013-11-041-11/+11
|\ \ \ \ \
| * | | | | Excpetion->ExceptionVicDeo2013-11-011-11/+11
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-0347-233/+333
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-03543-8563/+14034
* | | | | | Merge pull request #5678 from owncloud/fix-api-documentationThomas Müller2013-11-0350-391/+842
|\ \ \ \ \ \
| * | | | | | unify license headers for public API filesMorris Jobke2013-11-0345-382/+676
| * | | | | | fix "No page-level DocBlock"Morris Jobke2013-11-0323-9/+166
* | | | | | | Merge pull request #5671 from owncloud/fixing-5668-masterMorris Jobke2013-11-032-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | replace template function link_to_docs() with \OC_Helper::linkToDocs()Thomas Mueller2013-11-022-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4961 from owncloud/unshare-over-deleteMorris Jobke2013-11-032-54/+85
|\ \ \ \ \ \
| * | | | | | Always select item_source.Andreas Fischer2013-11-031-3/+3
| * | | | | | Deduplicate expiration date check into a method.Andreas Fischer2013-11-031-15/+21
| * | | | | | Use unshareItem() when unsharing expired shares.Andreas Fischer2013-11-031-2/+2
| * | | | | | Use unshareItem() in unshareAll().Andreas Fischer2013-11-031-1/+1
| * | | | | | Extract unshare() code into unshareItem().Andreas Fischer2013-11-031-17/+1
| * | | | | | OCP\Share::unshareAll(): Deduplicate hook parameters.Andreas Fischer2013-11-031-8/+26
| * | | | | | Add tests for OCP\Share::unshareAll().Andreas Fischer2013-11-031-10/+33
|/ / / / / /
* | | | | | Merge pull request #5672 from owncloud/fixing-5668-master-2VicDeo2013-11-031-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fixing Specified key was too long; max key length is 767 bytesThomas Mueller2013-11-021-1/+1
|/ / / / /
* | | | | Merge pull request #5652 from owncloud/front-port-5647-masterThomas Müller2013-11-011-15/+26
|\ \ \ \ \
| * | | | | extend unit test to directories starting or ending in whitespaceJörn Friedrich Dreyer2013-10-311-15/+26
* | | | | | Merge pull request #5443 from owncloud/fix-autoloader-cachingBart Visscher2013-11-012-24/+33
|\ \ \ \ \ \
| * | | | | | Allow null as cache parameter (if no cache was found) and for cache removal.Andreas Fischer2013-10-221-1/+1
| * | | | | | Only write-back on cache miss.Andreas Fischer2013-10-221-3/+3
| * | | | | | Only use autoloader cache when 'instanceid' is available.Andreas Fischer2013-10-221-5/+9