summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-273-17/+98
|\
| * Add explicit delete permission to link sharesVincent Petry2016-06-243-16/+98
* | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-266-5/+154
|\|
| * Increase fed share timeout from 3 to 10 + unit testsVincent Petry2016-06-222-6/+6
| * Add timeouts to make the UI usable again when a remote share is unreachableJoas Schilling2016-06-222-3/+13
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-222-0/+2
| * fix broken unit test (#25198)Thomas Müller2016-06-211-1/+8
| * Filter out group shares for owner where owner is included (#25190)Vincent Petry2016-06-212-2/+132
* | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-219-20/+118
|\|
| * Catch exceptions while creating shared mounts (#25077)Robin Appelman2016-06-202-11/+25
| * Merge pull request #25159 from owncloud/share-app-initorderVincent Petry2016-06-201-3/+3
| |\
| | * Delay files_sharing's registerMountProvidersVincent Petry2016-06-171-3/+3
| * | Make getShareFolder use given view instead of static FSVincent Petry2016-06-172-5/+9
| * | disable cleanFolder for the federated share storageRobin Appelman2016-06-142-1/+43
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-142-0/+38
* | Merge pull request #57 from nextcloud/fdrop-templateLukas Reschke2016-06-131-2/+31
|\ \
| * | smaller files drop fixesArthur Schiwon2016-06-111-2/+31
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-117-23/+113
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #25003 from owncloud/fix_ocs_path_responseVincent Petry2016-06-103-21/+65
| |\
| | * Extend unit testsRoeland Jago Douma2016-06-071-1/+33
| | * Fix unit testsRoeland Jago Douma2016-06-072-9/+21
| | * Show the path relative to the requesting userRoeland Jago Douma2016-06-071-12/+12
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-104-2/+48
* | | Merge pull request #19 from nextcloud/files-dropLukas Reschke2016-06-109-22/+249
|\ \ \ | |/ / |/| |
| * | Add text about uploaded filesLukas Reschke2016-06-103-3/+16
| * | Add some error handlingLukas Reschke2016-06-092-4/+27
| * | Add PHP unit testLukas Reschke2016-06-091-1/+25
| * | Fix public upload for normal sharesLukas Reschke2016-06-093-5/+7
| * | Make uploading possible via select and cleanup CSSLukas Reschke2016-06-094-33/+67
| * | Add fancy layoutLukas Reschke2016-06-093-5/+90
| * | Fix XSSLukas Reschke2016-06-091-1/+1
| * | Prevent access to shareinfo if share if read-onlyLukas Reschke2016-06-093-1/+19
| * | add hide file list optionBjoern Schiessle2016-06-095-20/+48
| * | Bring back sharedstorage hooksRoeland Jago Douma2016-06-091-0/+18
| * | handle path not being set in shared cache (#24993)Robin Appelman2016-06-091-1/+1
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-092-0/+2
* | Bring back sharedstorage hooksRoeland Jago Douma2016-06-081-0/+18
* | handle path not being set in shared cache (#24993)Robin Appelman2016-06-061-1/+1
|/
* Merge pull request #24964 from owncloud/issue-24961-public-upload-unlimitedVincent Petry2016-06-061-1/+1
|\
| * Allow public upload when the quota is unlimitedJoas Schilling2016-06-021-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-042-0/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-0332-608/+608
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-022-38/+38
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-314-6/+34
* Fix for #23066 (#24689)Torben Dannhauer2016-05-311-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-302-28/+28
* Update license headersLukas Reschke2016-05-2663-65/+124
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-264-26/+94
* Move tests to PSR-4Joas Schilling2016-05-2532-104/+118
* Move background job to PSR-4Joas Schilling2016-05-252-3/+3