summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #986 from owncloud/fixing-784-masterThomas Müller2013-01-181-0/+10
|\ | | | | the maximum upload size is now part of the response of the upload and de...
| * fixing indentThomas Mueller2013-01-181-10/+10
| |
| * Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-111-96/+484
| |\ | | | | | | | | | | | | Conflicts: apps/files/js/files.js
| * \ Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-064-73/+117
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js lib/helper.php
| * | | the maximum upload size is now part of the response of the upload and delete ↵Thomas Müller2012-12-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | operation. the maximum upload size is updated within the browser once an upload or delete operation has been finished
* | | | 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 return
| * | | | Remove uneeded returnsLukas Reschke2013-01-141-3/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-141-96/+484
|\| | |
| * | | add more linebreaks, replace SQL LIMIT with paramJörn Friedrich Dreyer2013-01-091-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
|/ /
* | Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-041-0/+44
|\ \ | | | | | | External API for ownCloud based on OCS
| * \ Merge branch 'master' into ocs_apiTom Needham2012-12-312-11/+47
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot
| * \ \ 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
|\ \ \ \ | | | | | | | | | | Really fix OCP\Share::shareItem with LDAP users
| * | | | Add an $excludingBackend optional parameterLorenzo M. Catucci2012-12-071-3/+3
| | | | | | | | | | | | | | | | | | | | to the userExists method both in OCP\User and in OC_User.
* | | | | [contacts_api] IAddressBook moved to OCP as it's used by apps to provide ↵Thomas Mueller2012-12-112-5/+79
| | | | | | | | | | | | | | | | | | | | access to their contact data
* | | | | [contacts_api] move addressbook to it's own fileThomas Mueller2012-12-081-51/+0
| | | | |
* | | | | [contacts_api] update documentationThomas Mueller2012-12-061-8/+8
| | | | |
* | | | | [Contacts API] example for searching addedThomas Mueller2012-12-021-0/+32
| | | | |
* | | | | test for search and unregister addedThomas Mueller2012-11-281-2/+2
| | | | |
* | | | | first unit tests implementedThomas Mueller2012-11-281-4/+11
| | | | |
* | | | | change name to IAddressBookThomas Mueller2012-11-281-6/+6
| | | | |
* | | | | plugin mechanism implementedThomas Mueller2012-11-281-63/+158
| | | | |
* | | | | Merge pull request #401 from owncloud/share_hooksJörn Friedrich Dreyer2012-11-281-5/+0
|\ \ \ \ \ | | | | | | | | | | | | Create functions to install standard hooks
| * | | | | Create functions to install standard hooksBart Visscher2012-11-131-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use these in tests that needs them Fix #151
* | | | | | readd fallback code for pre token linksJörn Friedrich Dreyer2012-11-231-1/+1
| | | | | |
* | | | | | implement share via link tokenJörn Friedrich Dreyer2012-11-201-19/+47
| |/ / / / |/| | | |
* | | | | Merge pull request #383 from owncloud/contacts_apiThomas Müller2012-11-191-0/+103
|\ \ \ \ \ | | | | | | | | | | | | Proposal for a public contacts api
| * | | | | function isEnabled() addedThomas Mueller2012-11-131-3/+13
| | | | | |
| * | | | | public contacts api as discussed here ↵Thomas Mueller2012-11-121-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/apps/issues/113
* | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-121-2/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #371 from butonic/sql_and_error_log_fixesblizzz2012-11-121-2/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | add missing sql backticks, check sharing for error and add log
| | * | | | | add missing sql backticks, check sharing for error and add logJörn Friedrich Dreyer2012-11-121-2/+5
| | |/ / / /