summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5182 from owncloud/fix-sharring-with-password-screenMorris Jobke2013-10-103-2/+33
|\
| * Fix password screen for public sharesMorris Jobke2013-10-073-2/+33
* | Merge pull request #5221 from owncloud/fixing-5217-masterVicDeo2013-10-101-2/+4
|\ \
| * | php 5.3 compatibility for Test_Files_Sharing_ApiThomas Müller2013-10-081-2/+4
* | | Added filesApp flag as input field for files app detectionVincent Petry2013-10-081-0/+1
|/ /
* | fix escapingMorris Jobke2013-10-081-1/+1
* | make sure that we only remove file/folder sharesBjoern Schiessle2013-10-082-3/+3
* | Added isPublic flag in files_sharing templateVincent Petry2013-10-071-0/+1
|/
* Merge pull request #5129 from owncloud/remove_deleted_shares_from_dbBjörn Schießle2013-10-073-7/+36
|\
| * catch exception if db query execution failsBjoern Schiessle2013-10-071-1/+5
| * Merge branch 'master' into remove_deleted_shares_from_dbBjoern Schiessle2013-10-074-1/+1035
| |\
| * | clean up oc_share table from files which are no longer existsBjoern Schiessle2013-10-072-7/+17
| * | add commentsBjoern Schiessle2013-10-041-0/+5
| * | remove deleted shares from the database table oc_shareBjoern Schiessle2013-10-021-0/+10
* | | Merge pull request #5102 from owncloud/input-simplifyMorris Jobke2013-10-041-3/+1
|\ \ \ | |_|/ |/| |
| * | fix multiselect bar opacity, webrootJan-Christoph Borchardt2013-10-041-1/+1
| * | simplify input elements for less cognitive load. No box-shadow, no text-shado...Jan-Christoph Borchardt2013-10-031-3/+1
| |/
* | Merge pull request #4877 from owncloud/ocs_share_apiBjörn Schießle2013-10-044-1/+1035
|\ \ | |/ |/|
| * update testsBjoern Schiessle2013-10-041-3/+3
| * use true/false instead of yes/no for publicUpload and subfiles parameterBjoern Schiessle2013-10-041-4/+4
| * use always path as parameter to specify a file/folderBjoern Schiessle2013-10-041-3/+3
| * also return success if no shares are found.Bjoern Schiessle2013-09-301-3/+4
| * add testUpdateShareUpload()Bjoern Schiessle2013-09-301-3/+62
| * add getShareFromFolder() testBjoern Schiessle2013-09-301-0/+37
| * Make sure that testDeleteShare() has some shares to deleteBjoern Schiessle2013-09-302-15/+39
| |\
| | * flipping arguments on assertEquals() - first argument contains the expected v...Thomas Müller2013-09-291-4/+4
| | * - adding unit test testGetShareFromUnknownId()Thomas Müller2013-09-292-11/+23
| * | add some commentsBjoern Schiessle2013-09-271-2/+3
| |/
| * add test getShareFromIdBjoern Schiessle2013-09-271-1/+36
| * Merge branch 'master' into ocs_share_apiBjoern Schiessle2013-09-2613-19/+112
| |\
| * | add some additional assertions to the testsBjoern Schiessle2013-09-251-2/+11
| * | add error message to the assertThomas Müller2013-09-251-2/+2
| * | remove debug outputBjoern Schiessle2013-09-231-1/+0
| * | make sure that files are shared correctly before each test and unshared again...Bjoern Schiessle2013-09-201-2/+43
| * | disable encrpytion app before performing testsBjoern Schiessle2013-09-201-11/+14
| * | disable encryption app for share API testsBjoern Schiessle2013-09-191-0/+14
| * | set share id to 'unknown' if we can't retrive oneBjoern Schiessle2013-09-191-7/+6
| * | extend API to get the shares from all files in a given folderBjoern Schiessle2013-09-191-0/+32
| * | remove some unused variablesBjoern Schiessle2013-09-191-6/+0
| * | some unit test for the new ocs share apiBjoern Schiessle2013-09-193-6/+325
| * | return error if wrong shareType is givenBjoern Schiessle2013-09-191-0/+2
| * | remove debug outputBjoern Schiessle2013-09-181-1/+1
| * | use share ID as REST resourceBjoern Schiessle2013-09-172-88/+168
| * | more rest-style APIBjoern Schiessle2013-09-172-52/+133
| * | return error if public upload is disabledBjoern Schiessle2013-09-161-19/+10
| * | allow to set a different permission during initial share operationBjoern Schiessle2013-09-161-3/+3
| * | ocs api for file sharingBjoern Schiessle2013-09-162-61/+84
| * | some more OCS calls for sharingBjoern Schiessle2013-09-062-22/+118
| * | intermediate result ocs apiBjoern Schiessle2013-09-062-8/+116
| * | intermediate results, share apiBjoern Schiessle2013-09-042-14/+48