Skip to content

[Stable9] downstream 16-06-13#84

Merged
MorrisJobke merged 3 commits intostable9from
stable9-downstream-160613
Jun 13, 2016
Merged

[Stable9] downstream 16-06-13#84
MorrisJobke merged 3 commits intostable9from
stable9-downstream-160613

Conversation

@blizzz
Copy link
Member

@blizzz blizzz commented Jun 13, 2016

rullzer and others added 3 commits June 13, 2016 12:47
Backport of #24898

Cherry-picked:
1b66db7
6022528
28d9ad2

But manually since we renamed stuff and the repair procedures changed
A share can only be requested by 3 'types' of people

* owner
* initiator
* recipient

So we have to get the path as the current user. Since that is the only
path that has any meaning to the user.

- Fixed tests
@blizzz blizzz added this to the Nextcloud 9 milestone Jun 13, 2016
@LukasReschke
Copy link
Member

LukasReschke commented Jun 13, 2016

LGTM. Nothing exploded.

@MorrisJobke
Copy link
Member

Tested and works 👍

@MorrisJobke MorrisJobke merged commit 447ab7c into stable9 Jun 13, 2016
@MorrisJobke MorrisJobke deleted the stable9-downstream-160613 branch June 13, 2016 22:03
@blizzz
Copy link
Member Author

blizzz commented Jun 13, 2016

LGTM also

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants