Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-10-17 | 1 | -1251/+1267 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | don't use depricated OC_Filesystem | Robin Appelman | 2012-10-10 | 2 | -4/+4 | |
* | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core | Sam Tuke | 2013-01-23 | 9 | -29/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #986 from owncloud/fixing-784-master | Thomas Müller | 2013-01-18 | 1 | -0/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | fixing indent | Thomas Mueller | 2013-01-18 | 1 | -10/+10 | |
| | * | | | | | | | | | | | | | | | Merge branch 'master' into fixing-784-master | Thomas Mueller | 2013-01-11 | 1 | -96/+484 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fixing-784-master | Thomas Mueller | 2013-01-06 | 4 | -73/+117 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | the maximum upload size is now part of the response of the upload and delete ... | Thomas Müller | 2012-12-20 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | Whitespace cleanup | Bart Visscher | 2013-01-16 | 4 | -9/+8 | |
| * | | | | | | | | | | | | | | | | | Spaces to tabs | Bart Visscher | 2013-01-16 | 2 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | Merge pull request #1178 from owncloud/return_true_because_of_ponies | Thomas Müller | 2013-01-15 | 1 | -3/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Remove uneeded returns | Lukas Reschke | 2013-01-14 | 1 | -3/+1 | |
| | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into fixing-unused-and-undefined-in-master | Thomas Mueller | 2013-01-14 | 1 | -96/+484 | |
| |\| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | fixing returns | Thomas Mueller | 2013-01-06 | 2 | -8/+8 | |
| * | | | | | | | | | | | | | | | | | fixing returns | Thomas Mueller | 2013-01-06 | 1 | -4/+3 | |
| * | | | | | | | | | | | | | | | | | add missing return | Thomas Mueller | 2013-01-06 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | fixing undefined variable $where | Thomas Mueller | 2013-01-06 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryption | Sam Tuke | 2013-01-14 | 1 | -0/+13 | |
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | add more linebreaks, replace SQL LIMIT with param | Jörn Friedrich Dreyer | 2013-01-09 | 1 | -96/+484 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #1053 from owncloud/ocs_api | Michael Gapczynski | 2013-01-04 | 1 | -0/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'master' into ocs_api | Tom Needham | 2012-12-31 | 2 | -11/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'master' into ocs_api | Tom Needham | 2012-12-16 | 1 | -16/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge master into ocs_api, fix conflicts. | Tom Needham | 2012-12-14 | 8 | -45/+386 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge master into ocs_api | Tom Needham | 2012-10-28 | 4 | -44/+141 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Allow apps to pass defaults and requirements for their API calls | Tom Needham | 2012-10-28 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | | | API: Default to user authentication level | Tom Needham | 2012-09-13 | 1 | -2/+3 | |
| * | | | | | | | | | | | | | | | Fix merge conflicts | Tom Needham | 2012-09-13 | 11 | -310/+1598 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Fix error with namespacing | Tom Needham | 2012-07-31 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | Make method static | Tom Needham | 2012-07-31 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | Add public class for registering api calls | Tom Needham | 2012-07-30 | 1 | -0/+41 | |
* | | | | | | | | | | | | | | | | | phpdoc fixes for public api | Robin Appelman | 2013-01-02 | 3 | -71/+71 | |
| |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | fixing variable name | Thomas Müller | 2012-12-21 | 1 | -2/+2 | |
| |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | fixes default email sender address | Randolph Carter | 2012-12-19 | 1 | -0/+36 | |
| |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | More whitespace fixes | Bart Visscher | 2012-12-15 | 1 | -16/+17 | |
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #584 from wardragon/ldap_access_userExists_fix | blizzz | 2012-12-12 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add an $excludingBackend optional parameter | Lorenzo M. Catucci | 2012-12-07 | 1 | -3/+3 | |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | [contacts_api] IAddressBook moved to OCP as it's used by apps to provide acce... | Thomas Mueller | 2012-12-11 | 2 | -5/+79 | |
* | | | | | | | | | | | | | [contacts_api] move addressbook to it's own file | Thomas Mueller | 2012-12-08 | 1 | -51/+0 | |
* | | | | | | | | | | | | | [contacts_api] update documentation | Thomas Mueller | 2012-12-06 | 1 | -8/+8 | |
* | | | | | | | | | | | | | [Contacts API] example for searching added | Thomas Mueller | 2012-12-02 | 1 | -0/+32 | |
* | | | | | | | | | | | | | test for search and unregister added | Thomas Mueller | 2012-11-28 | 1 | -2/+2 | |
* | | | | | | | | | | | | | first unit tests implemented | Thomas Mueller | 2012-11-28 | 1 | -4/+11 | |
* | | | | | | | | | | | | | change name to IAddressBook | Thomas Mueller | 2012-11-28 | 1 | -6/+6 | |
* | | | | | | | | | | | | | plugin mechanism implemented | Thomas Mueller | 2012-11-28 | 1 | -63/+158 | |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #401 from owncloud/share_hooks | Jörn Friedrich Dreyer | 2012-11-28 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Create functions to install standard hooks | Bart Visscher | 2012-11-13 | 1 | -5/+0 | |
* | | | | | | | | | | | | | readd fallback code for pre token links | Jörn Friedrich Dreyer | 2012-11-23 | 1 | -1/+1 | |
* | | | | | | | | | | | | | implement share via link token | Jörn Friedrich Dreyer | 2012-11-20 | 1 | -19/+47 | |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #383 from owncloud/contacts_api | Thomas Müller | 2012-11-19 | 1 | -0/+103 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | function isEnabled() added | Thomas Mueller | 2012-11-13 | 1 | -3/+13 |