Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update with robin | Joas Schilling | 2016-07-21 | 3 | -3/+3 |
| | |||||
* | Fix apps/ | Joas Schilling | 2016-07-21 | 22 | -31/+67 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-21 | 4 | -0/+66 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-19 | 8 | -0/+136 |
| | |||||
* | Merge pull request #379 from nextcloud/create_federated_share_on_mount | Morris Jobke | 2016-07-18 | 10 | -8/+996 |
|\ | | | | | Create federated share on mount | ||||
| * | don't convert link share to federated share if outgoing federated shares are ↵ | Bjoern Schiessle | 2016-07-14 | 2 | -12/+36 |
| | | | | | | | | forbidden | ||||
| * | rename SaveToNextcloudController to MountPublicLinkController | Bjoern Schiessle | 2016-07-14 | 3 | -20/+26 |
| | | |||||
| * | adjust copyright notices | Bjoern Schiessle | 2016-07-14 | 2 | -0/+4 |
| | | |||||
| * | remove unused parameter | Bjoern Schiessle | 2016-07-14 | 2 | -2/+2 |
| | | |||||
| * | allow to mount public link from Nextclouds <= 9 | Bjoern Schiessle | 2016-07-14 | 2 | -5/+136 |
| | | |||||
| * | move some stuff over to the federatedfilesharing app | Bjoern Schiessle | 2016-07-14 | 6 | -13/+525 |
| | | |||||
| * | s/ownCloud/Nextcloud | Bjoern Schiessle | 2016-07-14 | 3 | -13/+13 |
| | | |||||
| * | continue to accept the URL of the remote server instead of the federated ↵ | Bjoern Schiessle | 2016-07-14 | 2 | -12/+44 |
| | | | | | | | | cloud id | ||||
| * | add unit tests | Björn Schießle | 2016-07-14 | 1 | -0/+161 |
| | | |||||
| * | create a real federated share if a user add a public link to his ownCloud | Björn Schießle | 2016-07-14 | 5 | -5/+123 |
| | | | | | | | | this way the owner sees all mounted public links and control them individually | ||||
* | | Remove unneeded usage of tipsy | Morris Jobke | 2016-07-13 | 1 | -1/+0 |
|/ | | | | * tooltip is already initialized | ||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-09 | 2 | -4/+4 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-08 | 2 | -6/+6 |
| | |||||
* | Merge pull request #333 from nextcloud/sync-master | Lukas Reschke | 2016-07-07 | 2 | -27/+92 |
|\ | | | | | Sync master | ||||
| * | Merge branch 'master' into sync-master | Morris Jobke | 2016-07-07 | 81 | -236/+240 |
| |\ | |||||
| * | | Revert "[tx-robot] updated from transifex" | Morris Jobke | 2016-07-07 | 8 | -22/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4. Revert "[tx-robot] updated from transifex" This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e. Revert "[tx-robot] updated from transifex" This reverts commit e7cc8bac1e26935ed3bceb2b777659cc72cafdf2. Revert "[tx-robot] updated from transifex" This reverts commit 59fc3ff45a98e305ad65069d31fc78081fa88dc6. Revert "[tx-robot] updated from transifex" This reverts commit 6a89a63d2e5f6d807f6e99823b76f3cfea268c29. Revert "[tx-robot] updated from transifex" This reverts commit b0bad03234329113988d7d9c9cf2613d8f031c5f. | ||||
| * | | [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 |
| |\ \ | | | | | | | | | Only save federated share after remote server is notified | ||||
| | * | | 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 | Nextcloud bot | 2016-07-07 | 2 | -4/+4 |
| |_|/ |/| | | |||||
* | | | [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 |
|\| | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-28 | 2 | -0/+4 |
| | | | |||||
* | | | Merge pull request #236 from nextcloud/master-sync-upstream | Morris Jobke | 2016-06-28 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | [Master] sync upstream | ||||
| * | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-27 | 1 | -2/+2 |
| |\| | | |||||
| | * | | 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 server | ||||
| | | * | Remove a fed share from the local table before trying to notify the remote ↵ | Robin Appelman | 2016-06-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | server | ||||
* | | | | Add app:check-code for already compatible apps | Morris Jobke | 2016-06-27 | 1 | -2/+0 |
|/ / / | | | | | | | | | | | | | | | | * admin_audit, comments, federation * removed not needed call to OC_Util::checkAdminUser() (is already done by the request handler before) | ||||
* | | | 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 |
| | |