Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
| * | | | | Prevent error if previously cached data doesn't have an etag | Robin Appelman | 2014-04-22 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | merge master into webdav-injection | Robin Appelman | 2014-04-22 | 53 | -198/+422 |
| |\ \ \ \ | |||||
| * \ \ \ \ | merge master into webdav-injection | Robin Appelman | 2014-04-15 | 8 | -143/+165 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merge master into webdav-injection | Robin Appelman | 2014-04-15 | 113 | -2094/+2859 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge master into webdav-injection | Robin Appelman | 2014-03-26 | 110 | -1245/+1602 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | don't throw errors in getType | Robin Appelman | 2014-03-07 | 1 | -1/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | merge master into webdav-injection | Robin Appelman | 2014-03-06 | 25 | -285/+347 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove the need for a custom SabreDav server constructor | Robin Appelman | 2014-03-04 | 2 | -14/+16 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Make path for dummy fileinfo absolute | Robin Appelman | 2014-03-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix FileInfo->getType | Robin Appelman | 2014-03-03 | 2 | -3/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Pass the filesystem view as argument in the sabredav connectors and use the ↵ | Robin Appelman | 2014-02-25 | 7 | -270/+216 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fileinfo object | ||||
* | | | | | | | | | | fix paths of searchByMime results on substorages | Robin Appelman | 2014-04-25 | 1 | -2/+3 |
| |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-25 | 17 | -3/+239 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #8337 from owncloud/flv-to-mimes | Lukas Reschke | 2014-04-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add flv to known mimetypes | ||||
| * | | | | | | | | | Add flv to known mimetypes | Victor Dubiniuk | 2014-04-24 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #8026 from owncloud/remove_shared_folder | Björn Schießle | 2014-04-24 | 9 | -58/+121 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | remove the "Shared" folder | ||||
| * | | | | | | | | | remove hard-coded shared folder | Bjoern Schiessle | 2014-04-23 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | always allow to rename the share mount point | Bjoern Schiessle | 2014-04-23 | 1 | -1/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | make it possible to move files out of a shared mount point | Bjoern Schiessle | 2014-04-23 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | some fixes to make the gallery work, this made it necessary to adjust some ↵ | Bjoern Schiessle | 2014-04-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests and the encryption code | ||||
| * | | | | | | | | | we don't allow to share a folder if it contains a share mount point | Bjoern Schiessle | 2014-04-23 | 2 | -1/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | allow to rename group share mount points | Bjoern Schiessle | 2014-04-23 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | allow user to delete shared files/folders | Bjoern Schiessle | 2014-04-23 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fix target generation for group shares | Bjoern Schiessle | 2014-04-23 | 1 | -10/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fix share api tests | Bjoern Schiessle | 2014-04-23 | 1 | -5/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | we no longer need to handle the Shared folder different from any other folder | Bjoern Schiessle | 2014-04-23 | 3 | -26/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | add api to get shares from a specific user | Bjoern Schiessle | 2014-04-23 | 2 | -0/+32 |
| | | | | | | | | | | |||||
| * | | | | | | | | | user should be able to rename/delete shared files if the owner allowed it | Bjoern Schiessle | 2014-04-23 | 1 | -8/+21 |
| | | | | | | | | | | |||||
| * | | | | | | | | | allow to remove and change mount points | Bjoern Schiessle | 2014-04-23 | 2 | -0/+14 |
| | | | | | | | | | | |||||
| * | | | | | | | | | add some action items | Bjoern Schiessle | 2014-04-23 | 1 | -4/+4 |
| | | | | | | | | | |