summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Initial support for file sharing with filesystem branchMichael Gapczynski2012-12-151-4/+4
| * | | | | | merge master into filesystemRobin Appelman2012-12-153-65/+223
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-301-25/+48
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-211-0/+103
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-153-11/+69
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-073-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-042-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-10-271-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use absolute paths when resolving mount pointsRobin Appelman2012-10-271-2/+2
| * | | | | | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-271-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | move some stuff to the new apiRobin Appelman2012-10-261-6/+9
| * | | | | | | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-261-1/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-10-171-1251/+1267
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | don't use depricated OC_FilesystemRobin Appelman2012-10-102-4/+4
* | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/coreSam Tuke2013-01-239-29/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #986 from owncloud/fixing-784-masterThomas Müller2013-01-181-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | fixing indentThomas Mueller2013-01-181-10/+10
| | * | | | | | | | | | | | | | | Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-111-96/+484
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-064-73/+117
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | the maximum upload size is now part of the response of the upload and delete ...Thomas Müller2012-12-201-0/+10
| * | | | | | | | | | | | | | | | | Whitespace cleanupBart Visscher2013-01-164-9/+8
| * | | | | | | | | | | | | | | | | Spaces to tabsBart Visscher2013-01-162-3/+3
| * | | | | | | | | | | | | | | | | Merge pull request #1178 from owncloud/return_true_because_of_poniesThomas Müller2013-01-151-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Remove uneeded returnsLukas Reschke2013-01-141-3/+1
| | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-141-96/+484
| |\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | fixing returnsThomas Mueller2013-01-062-8/+8
| * | | | | | | | | | | | | | | | | fixing returnsThomas Mueller2013-01-061-4/+3
| * | | | | | | | | | | | | | | | | add missing returnThomas Mueller2013-01-061-1/+2
| * | | | | | | | | | | | | | | | | fixing undefined variable $whereThomas Mueller2013-01-061-1/+1
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryptionSam Tuke2013-01-141-0/+13
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | add more linebreaks, replace SQL LIMIT with paramJörn Friedrich Dreyer2013-01-091-96/+484
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-041-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into ocs_apiTom Needham2012-12-312-11/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into ocs_apiTom Needham2012-12-161-16/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge master into ocs_api, fix conflicts.Tom Needham2012-12-148-45/+386
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into ocs_apiTom Needham2012-10-284-44/+141
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Allow apps to pass defaults and requirements for their API callsTom Needham2012-10-281-2/+4
| * | | | | | | | | | | | | | | API: Default to user authentication levelTom Needham2012-09-131-2/+3
| * | | | | | | | | | | | | | | Fix merge conflictsTom Needham2012-09-1311-310/+1598
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix error with namespacingTom Needham2012-07-311-1/+1
| * | | | | | | | | | | | | | | | Make method staticTom Needham2012-07-311-1/+1
| * | | | | | | | | | | | | | | | Add public class for registering api callsTom Needham2012-07-301-0/+41
* | | | | | | | | | | | | | | | | phpdoc fixes for public apiRobin Appelman2013-01-023-71/+71
| |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | fixing variable nameThomas Müller2012-12-211-2/+2
| |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | fixes default email sender addressRandolph Carter2012-12-191-0/+36
| |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | More whitespace fixesBart Visscher2012-12-151-16/+17
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #584 from wardragon/ldap_access_userExists_fixblizzz2012-12-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add an $excludingBackend optional parameterLorenzo M. Catucci2012-12-071-3/+3
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | [contacts_api] IAddressBook moved to OCP as it's used by apps to provide acce...Thomas Mueller2012-12-112-5/+79
* | | | | | | | | | | | | [contacts_api] move addressbook to it's own fileThomas Mueller2012-12-081-51/+0