summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7546 from owncloud/no_freaking_tag_dupesLukas Reschke2014-05-091-21/+32
|\
| * Yet another cleanupThomas Tanghus2014-03-051-21/+32
* | Merge pull request #8512 from owncloud/fix-memcached-hasKeyAndreas Fischer2014-05-091-1/+1
|\ \
| * | Memcached hasKey should test for success, the get can fail for other reasons.Bart Visscher2014-05-081-1/+1
* | | Merge pull request #8499 from owncloud/shareextstoragemountpointfixVincent Petry2014-05-081-0/+4
|\ \ \ | |/ / |/| |
| * | Fix getPathById for OracleVincent Petry2014-05-081-0/+4
* | | Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-...Andreas Fischer2014-05-081-2/+2
|\ \ \
| * | | Use strict type comparisonLukas Reschke2014-05-071-2/+2
| |/ /
* | | Merge pull request #8221 from owncloud/type-hinting-sharingVincent Petry2014-05-081-94/+95
|\ \ \ | |/ / |/| |
| * | Use 'boolean' as type instead of 'bool'Bart Visscher2014-05-071-21/+21
| * | TypoBart Visscher2014-05-061-1/+1
| * | Some more params are optionalBart Visscher2014-05-011-3/+3
| * | Merge branch 'master' into type-hinting-sharingBart Visscher2014-04-2861-861/+1073
| |\ \
| * | | Fix PHPdoc in OC\Share\Share and OCP\ShareBart Visscher2014-04-151-87/+88
* | | | Merge pull request #8488 from owncloud/sabre-notfoundloglevelLukas Reschke2014-05-071-2/+15
|\ \ \ \
| * | | | Some expected Sabre exceptions are now logged with DEBUG levelVincent Petry2014-05-071-2/+15
* | | | | Merge pull request #8223 from owncloud/fix_linkToPublicVincent Petry2014-05-071-5/+13
|\ \ \ \ \
| * | | | | Also fix linkToAbsoluteThomas Tanghus2014-04-161-3/+7
| * | | | | Fix linkToPublic. Refs #8218Thomas Tanghus2014-04-151-2/+6
* | | | | | 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