summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7473 from owncloud/append-error-documentThomas Müller2014-04-282-46/+14
|\
| * Merge branch 'master' into append-error-documentThomas Müller2014-04-0265-1129/+3370
| |\
| * | Typo + use regular assignmentLukas Reschke2014-02-281-2/+2
| * | Remove .htaccess creation codeLukas Reschke2014-02-282-46/+14
* | | Merge pull request #8350 from owncloud/share-search-mimeicewind19912014-04-251-0/+1
|\ \ \
| * \ \ 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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | merge master into webdav-injectionRobin Appelman2014-04-2513-182/+385
| |\| | |
| * | | | 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-2242-285/+328
| |\ \ \ \
| * \ \ \ \ merge master into webdav-injectionRobin Appelman2014-04-158-143/+165
| |\ \ \ \ \
| * \ \ \ \ \ merge master into webdav-injectionRobin Appelman2014-04-1550-286/+2516
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master into webdav-injectionRobin Appelman2014-03-2642-934/+994
| |\ \ \ \ \ \ \
| * | | | | | | | don't throw errors in getTypeRobin Appelman2014-03-071-1/+4
| * | | | | | | | merge master into webdav-injectionRobin Appelman2014-03-0623-282/+328
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-031-2/+6
| * | | | | | | | | Pass the filesystem view as argument in the sabredav connectors and use the f...Robin Appelman2014-02-257-270/+216
* | | | | | | | | | fix paths of searchByMime results on substoragesRobin Appelman2014-04-251-2/+3
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge pull request #8337 from owncloud/flv-to-mimesLukas Reschke2014-04-241-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add flv to known mimetypesVictor Dubiniuk2014-04-241-0/+1
* | | | | | | | | | Merge pull request #8026 from owncloud/remove_shared_folderBjörn Schießle2014-04-248-58/+105
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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 te...Bjoern Schiessle2014-04-231-0/+1
| * | | | | | | | | 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-231-0/+16
| * | | | | | | | | 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
* | | | | | | | | | add additional rows to the select statement, 'stime' is needed for the expire...Bjoern Schiessle2014-04-241-3/+3
* | | | | | | | | | add setting to set default expire dateBjoern Schiessle2014-04-242-2/+62
* | | | | | | | | | This adds one more missing untranslated text from lib/shareVolkan Gezer2014-04-241-3/+4
* | | | | | | | | | Merge pull request #8324 from owncloud/expired-link-erroricewind19912014-04-231-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix error when viewing expired linkRobin Appelman2014-04-231-0/+3
* | | | | | | | | | Merge pull request #8009 from owncloud/feature/add-sharing-targetJoas Schilling2014-04-231-11/+52
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do not query when the list is emptyJoas Schilling2014-04-091-14/+16
| * | | | | | | | | | Add option to getUsersSharingFile() to get the paths for the shared usersJoas Schilling2014-04-091-11/+50