Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into sync-master | Morris Jobke | 2016-07-07 | 81 | -236/+240 |
|\ | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-06 | 14 | -19/+25 |
| * | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-07-01 | 2 | -0/+4 |
| |\ | |||||
| * \ | Merge pull request #236 from nextcloud/master-sync-upstream | Morris Jobke | 2016-06-28 | 1 | -2/+2 |
| |\ \ | |||||
| | * \ | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-27 | 1 | -2/+2 |
| | |\ \ | |||||
| * | | | | Add app:check-code for already compatible apps | Morris Jobke | 2016-06-27 | 1 | -2/+0 |
| |/ / / | |||||
| * | | | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 5 | -9/+35 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-21 | 6 | -2/+50 |
| |\ \ \ \ | |||||
| * | | | | | 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 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 | Arthur Schiwon | 2016-06-11 | 2 | -0/+8 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Downstream 2016-06-09 | Arthur Schiwon | 2016-06-09 | 4 | -0/+12 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |
* | | | | | | | | | Revert "[tx-robot] updated from transifex" | Morris Jobke | 2016-07-07 | 8 | -22/+6 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-05 | 2 | -0/+2 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-04 | 4 | -6/+12 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-03 | 2 | -0/+6 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-02 | 2 | -0/+2 |
* | | | | | | | | | Merge pull request #25262 from owncloud/fed-sharing-error | Vincent Petry | 2016-07-01 | 2 | -27/+92 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Log reason why we removed the fed share | Robin Appelman | 2016-06-27 | 1 | -0/+1 |
| * | | | | | | | | Handle exceptions thrown while trying to notify remote server of a fed share | Robin Appelman | 2016-06-27 | 2 | -27/+91 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-28 | 2 | -0/+4 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #25247 from owncloud/fed-unshare-fail | Vincent Petry | 2016-06-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Remove a fed share from the local table before trying to notify the remote se... | Robin Appelman | 2016-06-23 | 1 | -2/+2 |
* | | | | | | | [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 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | [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 |
| |_|_|/ |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-13 | 4 | -4/+10 |
| |_|/ |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-10 | 2 | -0/+8 |
| |/ |/| | |||||
* | | [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 |
|/ | |||||
* | [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 |