Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 5 | -9/+35 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-24 | 2 | -2/+8 |
| | | |||||
| * | Increase fed share timeout from 3 to 10 + unit tests | Vincent Petry | 2016-06-22 | 3 | -9/+24 |
| | | |||||
| * | Add timeouts to make the UI usable again when a remote share is unreachable | Joas Schilling | 2016-06-22 | 2 | -2/+7 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-21 | 6 | -2/+50 |
|\| | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-20 | 2 | -0/+2 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-17 | 4 | -2/+46 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-15 | 2 | -0/+2 |
| | | |||||
* | | s/ownCloud/Nextcloud | Bjoern Schiessle | 2016-06-20 | 78 | -218/+218 |
| | | |||||
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 | Arthur Schiwon | 2016-06-14 | 4 | -4/+10 |
|\| | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-13 | 4 | -4/+10 |
| | | |||||
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 | Arthur Schiwon | 2016-06-11 | 2 | -0/+8 |
|\| | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-10 | 2 | -0/+8 |
| | | |||||
* | | Downstream 2016-06-09 | Arthur Schiwon | 2016-06-09 | 4 | -0/+12 |
|\| | | | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160609 | ||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-09 | 2 | -0/+2 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-08 | 2 | -0/+10 |
| | | |||||
* | | Revert "Downstream 2016-06-08" | blizzz | 2016-06-09 | 2 | -10/+0 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-09 | 2 | -0/+10 |
| | | |||||
* | | THIS IS NEXTCLOUD! adjusting the design | Jan-Christoph Borchardt | 2016-06-08 | 1 | -2/+2 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-04 | 2 | -2/+8 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-03 | 18 | -6/+42 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-02 | 4 | -2/+4 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-01 | 2 | -0/+12 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-31 | 6 | -4/+48 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-30 | 22 | -42/+6 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-29 | 2 | -0/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-28 | 2 | -0/+6 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-27 | 8 | -0/+24 |
| | |||||
* | Update license headers | Lukas Reschke | 2016-05-26 | 19 | -30/+27 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-26 | 8 | -12/+34 |
| | |||||
* | Move lib/ to PSR-4 | Joas Schilling | 2016-05-25 | 1 | -0/+0 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-25 | 32 | -0/+82 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-24 | 50 | -10/+136 |
| | |||||
* | Merge pull request #24603 from owncloud/federated_reshare | Vincent Petry | 2016-05-23 | 16 | -84/+1798 |
|\ | | | | | flat federated re-share | ||||
| * | add missung return value | Björn Schießle | 2016-05-20 | 1 | -3/+4 |
| | | |||||
| * | improved error messages | Björn Schießle | 2016-05-20 | 3 | -21/+27 |
| | | |||||
| * | move motifier from the files_sharing app to the federatedfilessharing app | Björn Schießle | 2016-05-20 | 2 | -0/+110 |
| | | |||||
| * | fall back to old re-sharing behaviour in case the remote server doesn't ↵ | Björn Schießle | 2016-05-20 | 2 | -35/+70 |
| | | | | | | | | support flat-reshares | ||||
| * | update share permissions | Björn Schießle | 2016-05-20 | 3 | -12/+56 |
| | | |||||
| * | use share initiator as fall back to access the file | Björn Schießle | 2016-05-20 | 3 | -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 request | Björn Schießle | 2016-05-20 | 13 | -121/+765 |
| | | | | | | | | correctly accross share owner and share initiator | ||||
| * | use query builder for getShare and add tests | Björn Schießle | 2016-05-20 | 2 | -10/+99 |
| | | |||||
| * | move request handler for federated shares to the federated sharing app | Björn Schießle | 2016-05-20 | 3 | -0/+733 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-22 | 2 | -2/+2 |
|/ | |||||
* | Move FederatedFileSharing to PSR-4 | Joas Schilling | 2016-05-18 | 12 | -3/+1 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-12 | 2 | -2/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-08 | 2 | -0/+18 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-01 | 2 | -8/+8 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-30 | 2 | -2/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-26 | 92 | -78/+1016 |
| |