summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
| | |/ | |/|
* | | Merge pull request #6086 from owncloud/incognito_modeMorris Jobke2013-11-271-2/+2
|\ \ \
| * | | return false if user is in incognito modeBjoern Schiessle2013-11-271-2/+2
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2013-11-272-0/+9
|/ /
* | Merge pull request #6027 from owncloud/public-api-restful-routing-oc6Morris Jobke2013-11-273-2/+29
|\ \ | |/ |/|
| * add PHPDoc for urlParamsMorris Jobke2013-11-271-0/+1
| * adding documentation for registerRoutes()Thomas Müller2013-11-251-1/+13
| * fix appframework routingThomas Müller2013-11-253-2/+16
* | 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
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-261-0/+1
* | | | Add a (currently) empty system for running common repair stepsRobin Appelman2013-11-262-1/+26
* | | | remove passwords from logfileBjoern Schiessle2013-11-261-0/+2
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-263-0/+7
* | | merge master into single-user-modeRobin Appelman2013-11-2532-32/+276
|\ \ \
| * \ \ Merge pull request #6034 from owncloud/fix-api-documentationOwen Winkler2013-11-2529-25/+231
| |\ \ \
| | * | | fix some capital lettersMorris Jobke2013-11-255-5/+14
| | * | | page level doc blocks and class descriptionsMorris Jobke2013-11-2515-0/+95
| | * | | AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixesMorris Jobke2013-11-257-4/+58
| | * | | fix defaults.php docMorris Jobke2013-11-251-10/+18
| | * | | fix defaults.php docMorris Jobke2013-11-251-6/+44
| | * | | fix db.php docMorris Jobke2013-11-251-0/+2
| * | | | Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6Jörn Friedrich Dreyer2013-11-251-1/+12
| |\ \ \ \
| | * | | | in case uri and script name don't match we better throw an exceptionThomas Müller2013-11-251-2/+10
| | * | | | handle duplicate slashes in case of reverse proxy configurationThomas Müller2013-11-251-1/+4
| * | | | | Merge pull request #6037 from owncloud/fix-6007-oc6Thomas Müller2013-11-251-0/+12
| |\ \ \ \ \
| | * | | | | adding chunked upload handlingThomas Müller2013-11-251-0/+12
| | |/ / / /
| * / / / / provide more cli friendly error messagesRobin Appelman2013-11-251-6/+21
| |/ / / /