summaryrefslogtreecommitdiffstats
path: root/apps/federatedfilesharing
Commit message (Expand)AuthorAgeFilesLines
* Update with robinJoas Schilling2016-07-213-3/+3
* Fix apps/Joas Schilling2016-07-2122-31/+67
* [tx-robot] updated from transifexNextcloud bot2016-07-214-0/+66
* [tx-robot] updated from transifexNextcloud bot2016-07-198-0/+136
* Merge pull request #379 from nextcloud/create_federated_share_on_mountMorris Jobke2016-07-1810-8/+996
|\
| * don't convert link share to federated share if outgoing federated shares are ...Bjoern Schiessle2016-07-142-12/+36
| * rename SaveToNextcloudController to MountPublicLinkControllerBjoern Schiessle2016-07-143-20/+26
| * adjust copyright noticesBjoern Schiessle2016-07-142-0/+4
| * remove unused parameterBjoern Schiessle2016-07-142-2/+2
| * allow to mount public link from Nextclouds <= 9Bjoern Schiessle2016-07-142-5/+136
| * move some stuff over to the federatedfilesharing appBjoern Schiessle2016-07-146-13/+525
| * s/ownCloud/NextcloudBjoern Schiessle2016-07-143-13/+13
| * continue to accept the URL of the remote server instead of the federated clou...Bjoern Schiessle2016-07-142-12/+44
| * add unit testsBjörn Schießle2016-07-141-0/+161
| * create a real federated share if a user add a public link to his ownCloudBjörn Schießle2016-07-145-5/+123
* | Remove unneeded usage of tipsyMorris Jobke2016-07-131-1/+0
|/
* [tx-robot] updated from transifexNextcloud bot2016-07-092-4/+4
* [tx-robot] updated from transifexNextcloud bot2016-07-082-6/+6
* Merge pull request #333 from nextcloud/sync-masterLukas Reschke2016-07-072-27/+92
|\
| * Merge branch 'master' into sync-masterMorris Jobke2016-07-0781-236/+240
| |\
| * | Revert "[tx-robot] updated from transifex"Morris Jobke2016-07-078-22/+6
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-052-0/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-044-6/+12
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-032-0/+6
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-022-0/+2
| * | Merge pull request #25262 from owncloud/fed-sharing-errorVincent Petry2016-07-012-27/+92
| |\ \
| | * | Log reason why we removed the fed shareRobin Appelman2016-06-271-0/+1
| | * | Handle exceptions thrown while trying to notify remote server of a fed shareRobin Appelman2016-06-272-27/+91
* | | | [tx-robot] updated from transifexNextcloud bot2016-07-072-4/+4
| |_|/ |/| |
* | | [tx-robot] updated from transifexNextcloud bot2016-07-0614-19/+25
* | | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-012-0/+4
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-282-0/+4
* | | Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-281-2/+2
|\ \ \
| * | | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-271-2/+2
| |\| |
| | * | Merge pull request #25247 from owncloud/fed-unshare-failVincent Petry2016-06-271-2/+2
| | |\ \ | | | |/ | | |/|
| | | * Remove a fed share from the local table before trying to notify the remote se...Robin Appelman2016-06-231-2/+2
* | | | Add app:check-code for already compatible appsMorris Jobke2016-06-271-2/+0
|/ / /
* | | 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