summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
| * | | | Prevent error if previously cached data doesn't have an etagRobin Appelman2014-04-221-3/+4
| | | | |
| * | | | merge master into webdav-injectionRobin Appelman2014-04-2253-198/+422
| |\ \ \ \
| * \ \ \ \ merge master into webdav-injectionRobin Appelman2014-04-158-143/+165
| |\ \ \ \ \
| * \ \ \ \ \ merge master into webdav-injectionRobin Appelman2014-04-15113-2094/+2859
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master into webdav-injectionRobin Appelman2014-03-26110-1245/+1602
| |\ \ \ \ \ \ \
| * | | | | | | | don't throw errors in getTypeRobin Appelman2014-03-071-1/+4
| | | | | | | | |
| * | | | | | | | merge master into webdav-injectionRobin Appelman2014-03-0625-285/+347
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove the need for a custom SabreDav server constructorRobin Appelman2014-03-042-14/+16
| | | | | | | | | |
| * | | | | | | | | Make path for dummy fileinfo absoluteRobin Appelman2014-03-031-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix FileInfo->getTypeRobin Appelman2014-03-032-3/+7
| | | | | | | | | |
| * | | | | | | | | Pass the filesystem view as argument in the sabredav connectors and use the ↵Robin Appelman2014-02-257-270/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fileinfo object
* | | | | | | | | | fix paths of searchByMime results on substoragesRobin Appelman2014-04-251-2/+3
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2517-3/+239
| | | | | | | | |
* | | | | | | | | Merge pull request #8337 from owncloud/flv-to-mimesLukas Reschke2014-04-241-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add flv to known mimetypes
| * | | | | | | | | Add flv to known mimetypesVictor Dubiniuk2014-04-241-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #8026 from owncloud/remove_shared_folderBjörn Schießle2014-04-249-58/+121
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | remove the "Shared" folder
| * | | | | | | | | remove hard-coded shared folderBjoern Schiessle2014-04-231-1/+1
| | | | | | | | | |
| * | | | | | | | | always allow to rename the share mount pointBjoern Schiessle2014-04-231-1/+7
| | | | | | | | | |
| * | | | | | | | | make it possible to move files out of a shared mount pointBjoern Schiessle2014-04-231-4/+4
| | | | | | | | | |
| * | | | | | | | | some fixes to make the gallery work, this made it necessary to adjust some ↵Bjoern Schiessle2014-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests and the encryption code
| * | | | | | | | | we don't allow to share a folder if it contains a share mount pointBjoern Schiessle2014-04-232-1/+18
| | | | | | | | | |
| * | | | | | | | | allow to rename group share mount pointsBjoern Schiessle2014-04-231-0/+1
| | | | | | | | | |
| * | | | | | | | | allow user to delete shared files/foldersBjoern Schiessle2014-04-231-1/+2
| | | | | | | | | |
| * | | | | | | | | fix target generation for group sharesBjoern Schiessle2014-04-231-10/+18
| | | | | | | | | |
| * | | | | | | | | fix share api testsBjoern Schiessle2014-04-231-5/+1
| | | | | | | | | |
| * | | | | | | | | we no longer need to handle the Shared folder different from any other folderBjoern Schiessle2014-04-233-26/+0
| | | | | | | | | |
| * | | | | | | | | add api to get shares from a specific userBjoern Schiessle2014-04-232-0/+32
| | | | | | | | | |
| * | | | | | | | | user should be able to rename/delete shared files if the owner allowed itBjoern Schiessle2014-04-231-8/+21
| | | | | | | | | |
| * | | | | | | | | allow to remove and change mount pointsBjoern Schiessle2014-04-232-0/+14
| | | | | | | | | |
| * | | | | | | | | add some action itemsBjoern Schiessle2014-04-231-4/+4
| | | | | | | | | |