summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix-5388-mastertomneedham2013-12-1129-83/+327
|\
| * fix plural translation - fixes #6226Morris Jobke2013-12-071-1/+1
| * 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
| |\ \
| | * | 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 #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
| * | | | check if a directory exists before we try to remove itRobin Appelman2013-12-021-2/+6
| | |_|/ | |/| |
| * | | 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 #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
| * | | | Merge pull request #6106 from owncloud/fix_preview_creationMorris Jobke2013-11-281-15/+26
| |\ \ \ \
| | * | | | add PHPDoc for setMimetype()Bjoern Schiessle2013-11-281-0/+4
| | * | | | we need to be able to set the mimetype manuallyBjoern Schiessle2013-11-281-15/+22
| | |/ / /
| * | | | Merge pull request #6089 from owncloud/files-mimetyperefreshafterrenameFrank Karlitschek2013-11-281-0/+6
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Redetect mime type whenever extension is renamedVincent Petry2013-11-271-0/+6
| * | | | Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6Frank Karlitschek2013-11-281-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | on mssql the schema migration sometimes fails due to an already existing tran...Thomas Mueller2013-11-261-0/+2
| * | | | Merge pull request #6084 from owncloud/fix-app-routingThomas Müller2013-11-281-1/+5
| |\ \ \ \
| | * | | | Fix getRawPathInfo for the '/' edge caseRobin Appelman2013-11-271-1/+5
| | * | | | fix custom routes defined by appsRobin Appelman2013-11-271-1/+1
| | | |/ / | | |/| |
| * / | | return false if user is in incognito modeBjoern Schiessle2013-11-271-2/+2
| |/ / /
| * | | Merge pull request #6027 from owncloud/public-api-restful-routing-oc6Morris Jobke2013-11-272-2/+6
| |\ \ \ | | |/ / | |/| |
| | * | add PHPDoc for urlParamsMorris Jobke2013-11-271-0/+1
| | * | fix appframework routingThomas Müller2013-11-252-2/+5
| * | | Merge pull request #6058 from owncloud/ldap2avatarblizzz2013-11-264-10/+43
| |\ \ \
| | * | | Avatar: accept OC_Image as in setParameterArthur Schiwon2013-11-221-3/+7
| | * | | Enable user backends to provide avatar imagesArthur Schiwon2013-11-223-7/+36
| * | | | Merge pull request #6060 from owncloud/fix-6050-oc6Björn Schießle2013-11-261-8/+21
| |\ \ \ \
| | * | | | fixing failing unit testThomas Müller2013-11-261-1/+1
| | * | | | fixes #6050Thomas Müller2013-11-261-8/+21