summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* run first getUsersItemShared() with the ownerBjoern Schiessle2013-10-231-1/+1
* update etags for user we haven't checked yetBjoern Schiessle2013-10-231-1/+1
* keep a list of users we already checked to avoid loopsBjoern Schiessle2013-10-231-3/+3
* fix infinite loop while updating etags, fix for #4365Bjoern Schiessle2013-10-231-2/+4
* display the original file name - this will change in case of renamesThomas Müller2013-10-221-3/+3
* Merge pull request #5424 from owncloud/sharing-directlinkVincent Petry2013-10-213-0/+14
|\
| * unbold the 'Direct link' labelJan-Christoph Borchardt2013-10-211-1/+4
| * reduce width of direct link input fieldJan-Christoph Borchardt2013-10-211-1/+1
| * Added direct link in public share pageVincent Petry2013-10-183-0/+11
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-191-0/+8
|/
* Merge pull request #3219 from owncloud/disabled-links-uiFrank Karlitschek2013-10-182-0/+46
|\
| * Remove "link" shares right after disabling the "allow_link_share" settingMorris Jobke2013-10-182-0/+46
* | filter duplicates directly in the sql queryBjoern Schiessle2013-10-181-13/+4
|/
* Merge pull request #5382 from owncloud/sharing_api_include_resharesBjörn Schießle2013-10-172-27/+145
|\
| * split up reset()['path'] to make it compatible with older PHP versionsBjoern Schiessle2013-10-171-1/+2
| * add test for the reshare optionBjoern Schiessle2013-10-171-2/+59
| * adjust testsBjoern Schiessle2013-10-172-4/+3
| * new option to add reshares to the resultBjoern Schiessle2013-10-171-24/+85
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-172-0/+2
* | 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