summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uriVincent Petry2014-05-061-1/+4
|\
| * Send URI instead of filepath to NGINX for X-Acceljosh4trunks2014-04-031-1/+4
* | Merge pull request #8459 from owncloud/fix-getUserFolderMorris Jobke2014-05-051-2/+10
|\ \
| * | fix getUserFolder() of server containerMorris Jobke2014-05-051-2/+10
* | | Dont create borders around previews when scaling up is disabledRobin Appelman2014-05-051-1/+1
* | | Merge pull request #8386 from owncloud/fix_6946_masterVincent Petry2014-05-056-64/+39
|\ \ \ | |/ / |/| |
| * | Group Database backend must not gather user details itself but ask userArthur Schiwon2014-04-286-64/+39
* | | Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-masterThomas Müller2014-05-056-22/+48
|\ \ \
| * | | Images on public sharing get downscaled to increase use experience - this wil...Thomas Müller2014-05-026-22/+48
* | | | Fix PHP Doc and use readable variable nameLukas Reschke2014-05-041-6/+6
* | | | Does also take int or stringLukas Reschke2014-05-041-1/+1
* | | | Fix typoLukas Reschke2014-05-041-2/+2
* | | | Merge pull request #8023 from flyser/masterMorris Jobke2014-05-032-3/+27
|\ \ \ \
| * | | | Fix setting the max-upload-size for really large values.Fabian Henze2014-04-032-3/+27
* | | | | Merge pull request #8171 from owncloud/fix-importBernhard Posselt2014-05-021-3/+0
|\ \ \ \ \
| * | | | | add class Pimple to autloaderThomas Müller2014-04-281-3/+0
| * | | | | be nice and use a relative import so people can use the class without firing ...Bernhard Posselt2014-04-121-1/+1
* | | | | | Merge pull request #8377 from youngguns-nl/issue_8376Vincent Petry2014-05-022-2/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | refs #8376; spaces=>tabsSjors van der Pluijm2014-04-281-1/+1
| * | | | | refs #8376; added comment and applied patch on other filesSjors van der Pluijm2014-04-282-1/+15
| * | | | | rewind iterator before iteration startsSjors van der Pluijm2014-04-281-0/+1
| * | | | | fixes #8376Sjors van der Pluijm2014-04-281-1/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #8391 from owncloud/router-parameter-sortingThomas Müller2014-04-301-1/+1
|\ \ \ \ \
| * | | | | Preserve keys when sorting parameters when generatings urlsRobin Appelman2014-04-291-1/+1
* | | | | | Merge pull request #8132 from owncloud/issue/8131Thomas Müller2014-04-302-77/+57
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Deduplicate codeJoas Schilling2014-04-291-136/+39
| * | | | | Correctly emit create/update hooks when a large file is being created/updateJoas Schilling2014-04-291-0/+31
| * | | | | Emit a new hook, when a file is being updated onlyJoas Schilling2014-04-292-1/+47
* | | | | | Merge pull request #8285 from owncloud/better_getmountby_handlingicewind19912014-04-291-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Better handle return values from Filesystem::getMountBy*Robin McCorkell2014-04-251-1/+1
* | | | | | Update outdated commentVolkan Gezer2014-04-281-1/+1
* | | | | | remove preview office fallback as it makes too much trouble and generates ina...Georg Ehrke2014-04-282-149/+0
| |/ / / / |/| | | |
* | | | | Merge pull request #7473 from owncloud/append-error-documentThomas Müller2014-04-282-46/+14
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into append-error-documentThomas Müller2014-04-0265-1129/+3370
| |\ \ \ \ \
| * | | | | | Typo + use regular assignmentLukas Reschke2014-02-281-2/+2
| * | | | | | Remove .htaccess creation codeLukas Reschke2014-02-282-46/+14
* | | | | | | Merge pull request #8350 from owncloud/share-search-mimeicewind19912014-04-251-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into share-search-mimeRobin Appelman2014-04-251-2/+3
| |\ \ \ \ \ \ \
| * | | | | | | | Correct the path returned by getFolderContent for substoragesRobin Appelman2014-04-251-0/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #7504 from owncloud/webdav-injectionicewind19912014-04-257-256/+207
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | merge master into webdav-injectionRobin Appelman2014-04-2513-182/+385
| |\| | | | | |
| * | | | | | | properly quote etagsRobin Appelman2014-04-241-1/+1
| * | | | | | | Normalize paths when moving propertiesRobin Appelman2014-04-241-1/+1
| * | | | | | | fixing typos and PHPDocThomas Müller2014-04-235-8/+22
| * | | | | | | Revert changes to OC_Connector_Sabre_ServerRobin Appelman2014-04-231-41/+28
| * | | | | | | Prevent error if previously cached data doesn't have an etagRobin Appelman2014-04-221-3/+4
| * | | | | | | merge master into webdav-injectionRobin Appelman2014-04-2242-285/+328
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge master into webdav-injectionRobin Appelman2014-04-158-143/+165
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ merge master into webdav-injectionRobin Appelman2014-04-1550-286/+2516
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge master into webdav-injectionRobin Appelman2014-03-2642-934/+994
| |\ \ \ \ \ \ \ \ \ \