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.

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

[stable11] Make sure ownCloud 8.2 activities also can get displayed #3412

Merged
merged 5 commits into from Feb 10, 2017
Merged

[stable11] Make sure ownCloud 8.2 activities also can get displayed #3412

merged 5 commits into from Feb 10, 2017

Conversation

nickvergessen
Copy link
Member

@nickvergessen
Make sure ownCloud 8.2 activities also can get displayed
0f823b6 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Add tests for getFile()
b89e2ec 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Add tests for getUser()
fb38214 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix files sharing legacy as well
1badbe9 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen added this to the Nextcloud 11.0.2 milestone Feb 9, 2017
@nickvergessen nickvergessen mentioned this pull request Feb 9, 2017
Merged
LukasReschke
LukasReschke requested changes Feb 9, 2017
View reviewed changes
Copy link
Member

@LukasReschke LukasReschke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests seem to fail?

@nickvergessen
Backport more fixes
1ee9bee 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Copy link
Member Author

Yes, a new test was added and it assumed 2 backports were there.
Added them now

MorrisJobke
MorrisJobke approved these changes Feb 10, 2017
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and still works 👍

@LukasReschke LukasReschke merged commit 0cb59ad into stable11 Feb 10, 2017
@LukasReschke LukasReschke deleted the backport-3394-files-activity-expects-parameter-1-to-be-an-array branch February 10, 2017 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@LukasReschke LukasReschke LukasReschke approved these changes

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug feature: activity and notification feature: files feature: sharing
Projects
None yet
Milestone
Nextcloud 11.0.2
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nickvergessen @MorrisJobke @LukasReschke