summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix-5388-mastertomneedham2013-12-1177-150/+720
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-12-091-0/+8
| * Merge pull request #6231 from owncloud/fix-plural-l10nblizzz2013-12-091-1/+1
| |\
| | * fix plural translation - fixes #6226Morris Jobke2013-12-071-1/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-12-072-4/+21
| |/
| * Merge pull request #6150 from owncloud/backgroundjob-log-exceptionblizzz2013-12-063-7/+27
| |\
| | * remove background jobs if they are failingRobin Appelman2013-12-021-0/+1
| | * Catch exceptions from background jobs and log themRobin Appelman2013-12-023-7/+26
| * | Merge pull request #6201 from owncloud/backgroundscan-reuse-etagVincent Petry2013-12-061-1/+1
| |\ \
| | * \ Merge branch 'master' into backgroundscan-reuse-etagRobin Appelman2013-12-064-19/+34
| | |\ \
| | * | | reuse etags when doing a background scanRobin Appelman2013-12-051-1/+1
| * | | | XSendfile and encryption don't work togetherBart Visscher2013-12-061-0/+3
| * | | | Users of getFolderContent are mostly interested in the unecrypted file sizeBart Visscher2013-12-061-0/+4
| | |/ / | |/| |
| * | | Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expireBjörn Schießle2013-12-061-14/+21
| |\ \ \
| | * | | add a optional parameter to skip check for expired files, this is necessary t...Bjoern Schiessle2013-12-051-14/+21
| | |/ /
| * | | Revert "Revert "Fix user's displayName being overwritten by (old) cookie""Morris Jobke2013-12-051-1/+0
| * | | Revert "Fix user's displayName being overwritten by (old) cookie"Morris Jobke2013-12-051-0/+1
| * | | Fix user's displayName being overwritten by (old) cookieNico Kaiser2013-12-051-1/+0
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-042-4/+13
| |/ /
| * | Merge pull request #6169 from owncloud/php_version_warningMorris Jobke2013-12-041-2/+10
| |\ \
| | * | lower required php version to 5.3.3Frank Karlitschek2013-12-041-2/+10
| * | | Merge pull request #6168 from owncloud/extstorage-testtestmethodFrank Karlitschek2013-12-031-0/+8
| |\ \ \
| | * | | Added unit test for the test() methodVincent Petry2013-12-031-0/+8
| | | |/ | | |/|
| * | | Merge pull request #6076 from owncloud/fix-6073-masterThomas Müller2013-12-032-24/+43
| |\ \ \ | | |_|/ | |/| |
| | * | fixing PHPDoc and spellingThomas Mueller2013-12-022-6/+8
| | * | Use getLastError() everywhere.Andreas Fischer2013-11-281-10/+10
| | * | Add getLastError()Andreas Fischer2013-11-281-3/+20
| | * | No function as oci_last_error. It's oci_error.Andreas Fischer2013-11-281-1/+1
| | * | There is no property such as dbusername. It's 'dbuser'.Andreas Fischer2013-11-281-3/+3
| | * | Correct property name. It's 'dbpassword', with the 'db' prefix.Andreas Fischer2013-11-281-1/+1
| | * | Correct property name. It's just 'tableprefix', without the 'db' prefix.Andreas Fischer2013-11-281-1/+1
| * | | Merge pull request #5929 from owncloud/code_check_onFrank Karlitschek2013-12-031-2/+1
| |\ \ \
| | * | | switch code checker on by default. apps are not allowed to access some of the...Frank Karlitschek2013-11-181-2/+1
| * | | | Merge pull request #6158 from owncloud/rmdir-checkThomas Müller2013-12-021-2/+6
| |\ \ \ \
| | * | | | check if a directory exists before we try to remove itRobin Appelman2013-12-021-2/+6
| | | |_|/ | | |/| |
| * / | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-026-13/+22
| |/ / /
| * | | Merge pull request #6052 from owncloud/datetime-doctrineThomas Müller2013-12-011-3/+5
| |\ \ \
| | * | | Use the Doctrine to convert date string to DateTime object.Andreas Fischer2013-11-261-1/+2
| | * | | Use DateTime object instead of fixed format date string.Andreas Fischer2013-11-261-2/+1
| | * | | Use bindValue() instead of passing parameters in execute().Andreas Fischer2013-11-261-1/+3
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-293-1/+7
| * | | | Merge pull request #6129 from owncloud/chunking-fixtouchafterassembleFrank Karlitschek2013-11-291-1/+1
| |\ \ \ \
| | * | | | Fixed touch after chunk assemblingVincent Petry2013-11-291-1/+1
| * | | | | make 5.3.8 the minimum supported version. This fixes several issues with brok...Frank Karlitschek2013-11-291-4/+4
| |/ / / /
| * | | | Merge pull request #6077 from owncloud/fix-api-documentationFrank Karlitschek2013-11-293-2/+31
| |\ \ \ \
| | * | | | add comment from @DeepDiverMorris Jobke2013-11-271-2/+1
| | * | | | API doc for contacts manager, server container and shareMorris Jobke2013-11-273-2/+32
| * | | | | Merge pull request #6099 from owncloud/fix_source_not_found_warningsMorris Jobke2013-11-281-1/+5
| |\ \ \ \ \
| | * | | | | correctFolder() already resolves the dirname internallyBjoern Schiessle2013-11-281-1/+1
| | * | | | | make sure that we don't try to access an already deleted files, fixes some fi...Bjoern Schiessle2013-11-281-2/+6