Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8023 from flyser/master | Morris Jobke | 2014-05-03 | 2 | -3/+27 |
|\ | | | | | Fix setting the max-upload-size for really large values. | ||||
| * | Fix setting the max-upload-size for really large values. | Fabian Henze | 2014-04-03 | 2 | -3/+27 |
| | | | | | | | | php can only parse filesize units up to gigabytes, not terabytes or petabytes. | ||||
* | | Merge pull request #8171 from owncloud/fix-import | Bernhard Posselt | 2014-05-02 | 2 | -3/+1 |
|\ \ | | | | | | | be nice and use a relative import so people can use the class without fi... | ||||
| * | | add class Pimple to autloader | Thomas Müller | 2014-04-28 | 2 | -3/+1 |
| | | | |||||
| * | | be nice and use a relative import so people can use the class without firing ↵ | Bernhard Posselt | 2014-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | up owncloud | ||||
* | | | Merge pull request #8377 from youngguns-nl/issue_8376 | Vincent Petry | 2014-05-02 | 2 | -2/+20 |
|\ \ \ | | | | | | | | | RecursiveDirectoryIterator does not work on NFS | ||||
| * | | | refs #8376; spaces=>tabs | Sjors van der Pluijm | 2014-04-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | refs #8376; added comment and applied patch on other files | Sjors van der Pluijm | 2014-04-28 | 2 | -1/+15 |
| | | | | |||||
| * | | | rewind iterator before iteration starts | Sjors van der Pluijm | 2014-04-28 | 1 | -0/+1 |
| | | | | |||||
| * | | | fixes #8376 | Sjors van der Pluijm | 2014-04-28 | 1 | -1/+4 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-01 | 4 | -0/+27 |
| | | | | |||||
* | | | | Merge pull request #8391 from owncloud/router-parameter-sorting | Thomas Müller | 2014-04-30 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Preserve keys when sorting parameters when generatings urls | ||||
| * | | | | Preserve keys when sorting parameters when generatings urls | Robin Appelman | 2014-04-29 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #8132 from owncloud/issue/8131 | Thomas Müller | 2014-04-30 | 2 | -77/+57 |
|\ \ \ \ \ | | | | | | | | | | | | | Issue/8131 Fix emitting of filesystem related hooks | ||||
| * | | | | | Deduplicate code | Joas Schilling | 2014-04-29 | 1 | -136/+39 |
| | | | | | | |||||
| * | | | | | Correctly emit create/update hooks when a large file is being created/update | Joas Schilling | 2014-04-29 | 1 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after being uploaded in .part files Fix #8131 | ||||
| * | | | | | Emit a new hook, when a file is being updated only | Joas Schilling | 2014-04-29 | 2 | -1/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The write-hook also is triggered for created files Fix #8131 | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-30 | 5 | -0/+32 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #8285 from owncloud/better_getmountby_handling | icewind1991 | 2014-04-29 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Handle return values better from Filesystem::getMountBy* | ||||
| * | | | | Better handle return values from Filesystem::getMountBy* | Robin McCorkell | 2014-04-25 | 1 | -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 transifex | Jenkins for ownCloud | 2014-04-29 | 7 | -0/+9 |
| | | | | | |||||
* | | | | | Merge pull request #7852 from josh4trunks/basic_auth_fix | Thomas Müller | 2014-04-28 | 1 | -13/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixes login / logout when HTTP Basic Headers are avilable. | ||||
| * | | | | | Fixed Typo | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Don't always $cookie_path, only set it when needed | josh4trunks | 2014-04-03 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | cookie would be useless if value is not set | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Don't to set the cookie it wasn't needed. | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixes login / logout when HTTP Basic Headers are avilable. | josh4trunks | 2014-04-03 | 1 | -13/+15 |
| | | | | | | |||||
* | | | | | | Update outdated comment | Volkan Gezer | 2014-04-28 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | remove preview office fallback as it makes too much trouble and generates ↵ | Georg Ehrke | 2014-04-28 | 2 | -149/+0 |
| |_|/ / / |/| | | | | | | | | | | | | | | inacceptable results | ||||
* | | | | | Merge pull request #7473 from owncloud/append-error-document | Thomas Müller | 2014-04-28 | 2 | -46/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove .htaccess creation code | ||||
| * \ \ \ \ | Merge branch 'master' into append-error-document | Thomas Müller | 2014-04-02 | 135 | -3156/+4041 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/setup.php lib/private/updater.php | ||||
| * | | | | | | Typo + use regular assignment | Lukas Reschke | 2014-02-28 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Remove .htaccess creation code | Lukas Reschke | 2014-02-28 | 2 | -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 transifex | Jenkins for ownCloud | 2014-04-28 | 14 | -16/+15 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #8372 from owncloud/give-admins-a-hint | Lukas Reschke | 2014-04-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Clarify the trusted_domain error page | ||||
| * | | | | | | | Remove an added t by the github webeditor | Lukas Reschke | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Notice to myself: Stick to my IDE. | ||||
| * | | | | | | | Grammatical fixes | Lukas Reschke | 2014-04-27 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Clarify the trusted_domain error page | Lukas Reschke | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-27 | 1 | -0/+1 |
|/ / / / / / / | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-26 | 10 | -21/+77 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #8350 from owncloud/share-search-mime | icewind1991 | 2014-04-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix search by mime for shared single files | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into share-search-mime | Robin Appelman | 2014-04-25 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Correct the path returned by getFolderContent for substorages | Robin Appelman | 2014-04-25 | 1 | -0/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #7504 from owncloud/webdav-injection | icewind1991 | 2014-04-25 | 7 | -256/+207 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Proper injection of filesystem view into the webdav connector | ||||
| * | | | | | | | merge master into webdav-injection | Robin Appelman | 2014-04-25 | 34 | -197/+671 |
| |\| | | | | | | |||||
| * | | | | | | | properly quote etags | Robin Appelman | 2014-04-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Normalize paths when moving properties | Robin Appelman | 2014-04-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | fixing typos and PHPDoc | Thomas Müller | 2014-04-23 | 5 | -8/+22 |
| | | | | | | | | |||||
| * | | | | | | | Revert changes to OC_Connector_Sabre_Server | Robin Appelman | 2014-04-23 | 1 | -41/+28 |
| | | | | | | | |