summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszeroMorris Jobke2013-10-171-1/+2
|\
| * Fixed zip download button for unlimited filesize in public modeVincent Petry2013-10-171-1/+2
* | Fixed sharing status update for new/uploaded filesVincent Petry2013-10-171-3/+11
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-166-0/+13
* Merge pull request #5269 from owncloud/ocs_share_api_add_received_fromBjörn Schießle2013-10-152-8/+20
|\
| * fix api testsBjoern Schiessle2013-10-111-1/+2
| * add "received_from" and "received_from_displayname" field in case of a reshar...Bjoern Schiessle2013-10-101-7/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-138-0/+8
* | Merge pull request #5233 from owncloud/enc_filter_usersBjörn Schießle2013-10-111-3/+4
|\ \
| * | make sure that we are logged in ad user1 while performing the testsBjoern Schiessle2013-10-101-3/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-1064-64/+0
| |/ |/|
* | 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