summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | 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