summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Expand)AuthorAgeFilesLines
* Merge master into ocs_apiTom Needham2012-10-284-44/+141
|\
| * Add BackgroundJob::setExecutionType() to public APIJakob Sack2012-10-271-0/+23
| * fixed user/group sharing hooksFlorian Hülsmann2012-10-261-13/+13
| * Hook emission on sharing stuffFlorian Hülsmann2012-10-261-1/+30
| * Fix unshareAll()Michael Gapczynski2012-10-161-2/+4
| * Add unshareAll() function to Share APIMichael Gapczynski2012-10-161-0/+14
| * Whitespace cleanupBart Visscher2012-10-141-1251/+1251
| * fix for bug #1942: Allow user to share with every group if "allow users to sh...Björn Schießle2012-10-091-2/+3
| * added "uid_owner" to select statementBjörn Schießle2012-10-081-1/+1
| * Fix - "Correct checking item source for share from same owner when generating...Michael Gapczynski2012-10-061-2/+8
| * Correct checking item source for share from same owner when generating item t...Michael Gapczynski2012-10-021-1241/+1242
| * we are sharing the same file again if item_source of the already shared file ...Björn Schießle2012-10-021-0/+3
| * remove unnecessary code and add missing items to select statementBjörn Schießle2012-10-021-14/+2
| * merge all possible conflicts into on arrayBjörn Schießle2012-10-021-10/+9
| * We can't rely on the assumption that if the matching target is from the same ...Björn Schießle2012-10-021-10/+30
| * Do urlencoding in linkTo functionsBart Visscher2012-09-281-0/+2
| * Fix unsetting share expiration dateMichael Gapczynski2012-09-261-2/+6
| * Properly format the share expiration time for the database, fixes bug oc-1779Michael Gapczynski2012-09-251-5/+10
| * fix some more phpdocRobin Appelman2012-09-231-28/+28
* | 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
|\|
| * Merge branch 'master' into share_expirationMichael Gapczynski2012-09-1211-422/+437
| |\
| | * Temporarily disable sharing with contacts and emails, will come in next releaseMichael Gapczynski2012-09-121-20/+20
| | * Fix problem with non share collection item types being treated as collectionsMichael Gapczynski2012-09-111-6/+14
| | * Don't display actions for children in shared collections, show the parent col...Michael Gapczynski2012-09-091-1/+6
| | * Fix shared collection item searchingMichael Gapczynski2012-09-091-29/+38
| | * Normalize the file path for shared children as a precautionMichael Gapczynski2012-09-081-1/+2
| | * Insert id for unique user group share rowsMichael Gapczynski2012-09-081-0/+1
| | * Fix fetching shared children items, fixes problem with displaying owner of a ...Michael Gapczynski2012-09-081-10/+19
| | * Fix unsharing from self for group shares and add test for itMichael Gapczynski2012-09-081-3/+17
| | * style fixes for public util apiGeorg Ehrke2012-09-081-24/+9
| | * style fixes for public user apiGeorg Ehrke2012-09-081-25/+13
| | * style fixes for public response apiGeorg Ehrke2012-09-081-9/+1
| | * style fixes for public json apiGeorg Ehrke2012-09-081-2/+0
| | * style fixes for public files apiGeorg Ehrke2012-09-081-17/+6
| | * style fixes for public db apiGeorg Ehrke2012-09-081-9/+0
| | * style fixes for public config apiGeorg Ehrke2012-09-081-58/+45
| | * style fixes for public app apiGeorg Ehrke2012-09-081-97/+97
| | * style fixes for public app apiGeorg Ehrke2012-09-081-116/+105
| | * adding space between) and {Thomas Mueller2012-09-079-66/+66
| | * Support for unshare from self, with a bunch of temporary fixes to overcome co...Michael Gapczynski2012-09-071-1/+2
| | * Add args parameter to linkTo(Absolute) function, to append the args automaticlyBart Visscher2012-09-031-4/+6
| | * Listen to post_deleteGroup hook in Share APIMichael Gapczynski2012-09-021-0/+9
| | * Fix some warnings from Jenkins in the Share APIMichael Gapczynski2012-09-021-6/+2
| | * Add parameter documentationMichael Gapczynski2012-09-021-0/+1
| | * Restructure generateTarget for the post_addToGroup hookMichael Gapczynski2012-09-021-20/+44
| | * Make item targets be based off of the parent item target for resharesMichael Gapczynski2012-09-021-19/+27
| | * use null instead of -1 on all getUser()Jörn Friedrich Dreyer2012-09-011-1/+1
| | * Space before tab fixesBart Visscher2012-08-292-2/+2