Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Stable9] downstream 16-06-13 #84

Merged
merged 3 commits into from
Jun 13, 2016
Merged

[Stable9] downstream 16-06-13 #84

merged 3 commits into from
Jun 13, 2016

Conversation

blizzz
Copy link
Member

@blizzz blizzz commented Jun 13, 2016

rullzer and others added 3 commits June 13, 2016 12:47
@rullzer @DeepDiver1975
Repair job to fix permissions for avatars (#25068)
7863987 
Backport of #24898

Cherry-picked:
1b66db7
6022528
28d9ad2

But manually since we renamed stuff and the repair procedures changed
@rullzer @DeepDiver1975
Show the path relative to the requesting user (#25067)
d41d5c4 
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
Merge branch 'stable9' of https://github.com/owncloud/core into downs…
a761fd6 
…tream-160613
@blizzz blizzz added this to the Nextcloud 9 milestone Jun 13, 2016
@LukasReschke
Copy link
Member

LukasReschke commented Jun 13, 2016 •
edited
Loading

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

@ChildLearningClub ChildLearningClub mentioned this pull request Jan 20, 2020
Closed
@lynnpepin lynnpepin mentioned this pull request Jan 24, 2020
Closed
@enoch85 enoch85 mentioned this pull request Jan 28, 2020
Closed
This was referenced Jan 29, 2020
Closed
Closed
@haghighi haghighi mentioned this pull request Feb 1, 2020
Closed
@liamdennehy liamdennehy mentioned this pull request Feb 18, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Nextcloud 9
Development

Successfully merging this pull request may close these issues.
4 participants
@blizzz @LukasReschke @MorrisJobke @rullzer