summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8023 from flyser/masterMorris Jobke2014-05-032-3/+27
|\ | | | | Fix setting the max-upload-size for really large values.
| * Fix setting the max-upload-size for really large values.Fabian Henze2014-04-032-3/+27
| | | | | | | | php can only parse filesize units up to gigabytes, not terabytes or petabytes.
* | Merge pull request #8171 from owncloud/fix-importBernhard Posselt2014-05-022-3/+1
|\ \ | | | | | | be nice and use a relative import so people can use the class without fi...
| * | add class Pimple to autloaderThomas Müller2014-04-282-3/+1
| | |
| * | be nice and use a relative import so people can use the class without firing ↵Bernhard Posselt2014-04-121-1/+1
| | | | | | | | | | | | up owncloud
* | | Merge pull request #8377 from youngguns-nl/issue_8376Vincent Petry2014-05-022-2/+20
|\ \ \ | | | | | | | | RecursiveDirectoryIterator does not work on NFS
| * | | 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
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-021-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-014-0/+27
| | | |
* | | | Merge pull request #8391 from owncloud/router-parameter-sortingThomas Müller2014-04-301-1/+1
|\ \ \ \ | | | | | | | | | | Preserve keys when sorting parameters when generatings urls
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Issue/8131 Fix emitting of filesystem related hooks
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after being uploaded in .part files Fix #8131
| * | | | | Emit a new hook, when a file is being updated onlyJoas Schilling2014-04-292-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The write-hook also is triggered for created files Fix #8131
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-305-0/+32
| |/ / / / |/| | | |
* | | | | Merge pull request #8285 from owncloud/better_getmountby_handlingicewind19912014-04-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Handle return values better from Filesystem::getMountBy*
| * | | | Better handle return values from Filesystem::getMountBy*Robin McCorkell2014-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getMountByStorageId and getMountByNumericId return an empty array on error, which should be detected to avoid possible errors. This commit also adds in some new logging points and throws to aid debugging
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-297-0/+9
| | | | |
* | | | | Merge pull request #7852 from josh4trunks/basic_auth_fixThomas Müller2014-04-281-13/+14
|\ \ \ \ \ | | | | | | | | | | | | Fixes login / logout when HTTP Basic Headers are avilable.
| * | | | | Fixed Typojosh4trunks2014-04-031-1/+1
| | | | | |
| * | | | | Don't always $cookie_path, only set it when neededjosh4trunks2014-04-031-3/+2
| | | | | |
| * | | | | cookie would be useless if value is not setjosh4trunks2014-04-031-1/+1
| | | | | |
| * | | | | Don't to set the cookie it wasn't needed.josh4trunks2014-04-031-1/+1
| | | | | |
| * | | | | Fixes login / logout when HTTP Basic Headers are avilable.josh4trunks2014-04-031-13/+15
| | | | | |
* | | | | | Update outdated commentVolkan Gezer2014-04-281-1/+1
| | | | | |
* | | | | | remove preview office fallback as it makes too much trouble and generates ↵Georg Ehrke2014-04-282-149/+0
| |_|/ / / |/| | | | | | | | | | | | | | inacceptable results
* | | | | Merge pull request #7473 from owncloud/append-error-documentThomas Müller2014-04-282-46/+14
|\ \ \ \ \ | | | | | | | | | | | | Remove .htaccess creation code
| * \ \ \ \ Merge branch 'master' into append-error-documentThomas Müller2014-04-02135-3156/+4041
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/setup.php lib/private/updater.php
| * | | | | | Typo + use regular assignmentLukas Reschke2014-02-281-2/+2
| | | | | | |
| * | | | | | Remove .htaccess creation codeLukas Reschke2014-02-282-46/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. We're maintaining the same code twice which leads inevitably to problems as this one. The createHtaccess routine is only used to use the correct paths to the 404 and 403 document. 2. Updating the ownCloud instance as described in our documentation (`Delete everything from your ownCloud installation directory, except data and config.`) will break the links to the ErrorDocuments anyways and show the default error handlers if ownCloud is not installed in the root directory.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2814-16/+15
| | | | | | |
* | | | | | | Merge pull request #8372 from owncloud/give-admins-a-hintLukas Reschke2014-04-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Clarify the trusted_domain error page
| * | | | | | | Remove an added t by the github webeditorLukas Reschke2014-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Notice to myself: Stick to my IDE.
| * | | | | | | Grammatical fixesLukas Reschke2014-04-271-2/+2
| | | | | | | |
| * | | | | | | Clarify the trusted_domain error pageLukas Reschke2014-04-261-1/+1
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-271-0/+1
|/ / / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2610-21/+77
| | | | | | |
* | | | | | | Merge pull request #8350 from owncloud/share-search-mimeicewind19912014-04-251-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix search by mime for shared single files
| * \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Proper injection of filesystem view into the webdav connector
| * | | | | | | merge master into webdav-injectionRobin Appelman2014-04-2534-197/+671
| |\| | | | | |
| * | | | | | | 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
| | | | | | | |