aboutsummaryrefslogtreecommitdiffstats
path: root/apps/federatedfilesharing
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-265-9/+35
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-242-2/+8
| |
| * Increase fed share timeout from 3 to 10 + unit testsVincent Petry2016-06-223-9/+24
| |
| * Add timeouts to make the UI usable again when a remote share is unreachableJoas Schilling2016-06-222-2/+7
| |
* | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-216-2/+50
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-202-0/+2
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-174-2/+46
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-152-0/+2
| |
* | s/ownCloud/NextcloudBjoern Schiessle2016-06-2078-218/+218
| |
* | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-144-4/+10
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-134-4/+10
| |
* | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-112-0/+8
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-102-0/+8
| |
* | Downstream 2016-06-09Arthur Schiwon2016-06-094-0/+12
|\| | | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-092-0/+2
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-082-0/+10
| |
* | Revert "Downstream 2016-06-08"blizzz2016-06-092-10/+0
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-092-0/+10
| |
* | THIS IS NEXTCLOUD! adjusting the designJan-Christoph Borchardt2016-06-081-2/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-042-2/+8
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-0318-6/+42
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-024-2/+4
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-012-0/+12
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-316-4/+48
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-3022-42/+6
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-292-0/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-282-0/+6
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-278-0/+24
|
* Update license headersLukas Reschke2016-05-2619-30/+27
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-268-12/+34
|
* Move lib/ to PSR-4Joas Schilling2016-05-251-0/+0
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-2532-0/+82
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-2450-10/+136
|
* Merge pull request #24603 from owncloud/federated_reshareVincent Petry2016-05-2316-84/+1798
|\ | | | | flat federated re-share
| * add missung return valueBjörn Schießle2016-05-201-3/+4
| |
| * improved error messagesBjörn Schießle2016-05-203-21/+27
| |
| * move motifier from the files_sharing app to the federatedfilessharing appBjörn Schießle2016-05-202-0/+110
| |
| * fall back to old re-sharing behaviour in case the remote server doesn't ↵Björn Schießle2016-05-202-35/+70
| | | | | | | | support flat-reshares
| * update share permissionsBjörn Schießle2016-05-203-12/+56
| |
| * use share initiator as fall back to access the fileBjörn Schießle2016-05-203-8/+60
| | | | | | | | | | in case of federated re-shares the owner can be a remote user. Therefore we can't always use to owner to access the local file
| * create re-share by owner and propagate unshare and unshare-from self requestBjörn Schießle2016-05-2013-121/+765
| | | | | | | | correctly accross share owner and share initiator
| * use query builder for getShare and add testsBjörn Schießle2016-05-202-10/+99
| |
| * move request handler for federated shares to the federated sharing appBjörn Schießle2016-05-203-0/+733
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-222-2/+2
|/
* Move FederatedFileSharing to PSR-4Joas Schilling2016-05-1812-3/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-122-2/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-082-0/+18
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-012-8/+8
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-302-2/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-2692-78/+1016
|