summaryrefslogtreecommitdiffstats
path: root/apps/federatedfilesharing
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sync-masterMorris Jobke2016-07-0781-236/+240
|\
| * [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
| |\
| * \ 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
| | |\ \
| * | | | 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
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-216-2/+50
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-112-0/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Downstream 2016-06-09Arthur Schiwon2016-06-094-0/+12
| |\ \ \ \ \ \ \
| * | | | | | | | 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
* | | | | | | | | 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 transifexJenkins for ownCloud2016-06-282-0/+4
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | 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
* | | | | | | [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
| |_|_|_|/ |/| | | |
* | | | | [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
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-134-4/+10
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-102-0/+8
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-092-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-082-0/+10
|/
* [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