summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* we need to be able to set the mimetype manuallyBjoern Schiessle2013-11-281-15/+22
* 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
| |/ / / /
* / / / / Add "single user mode" which restricts access to users in the admin groupRobin Appelman2013-11-251-1/+18
|/ / / /
* | | | Merge pull request #6021 from owncloud/show_buildThomas Müller2013-11-242-0/+14
|\ \ \ \
| * | | | add new function to generate the human readable version string based on versi...Thomas Mueller2013-11-241-0/+13
| * | | | send the build number too to push the next daily build. This is needed for th...Frank Karlitschek2013-11-241-0/+1
* | | | | Merge pull request #5874 from owncloud/fix-5845Thomas Müller2013-11-242-2/+2
|\ \ \ \ \
| * | | | | Compare dirname() results to DIRECTORY_SEPARATOR, not '/'ringmaster2013-11-141-1/+1
| * | | | | Alias the aggregate columns so SQL Server doesn't combine them.ringmaster2013-11-141-1/+1
* | | | | | update PHPDocThomas Mueller2013-11-241-0/+1
* | | | | | fix overwrite host support and make the code a bit more readableFrank Karlitschek2013-11-241-1/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #5995 from owncloud/extstorage-isreadablefixVincent Petry2013-11-241-0/+13
|\ \ \ \ \
| * | | | | Moved default isReadable/isUpdatable impl into Common classVincent Petry2013-11-221-0/+13
| | |_|_|/ | |/| | |
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-246-1/+6
|/ / / /
* | | | Revert "use relative paths to create images from a file. This way it also wor...Bjoern Schiessle2013-11-221-16/+15
* | | | Merge pull request #6003 from owncloud/incognito_modeVincent Petry2013-11-221-1/+13
|\ \ \ \
| * | | | add incognito mode, allows to hide my user ID. For example, this is useful to...Bjoern Schiessle2013-11-221-1/+13