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

Limit file activities to favorites #271

Merged
merged 6 commits into from
Apr 9, 2015

Conversation

nickvergessen
Copy link
Contributor

@karlitschek
Copy link

@nickvergessen Can we merge this?:-)

@nickvergessen
Copy link
Contributor Author

Not quite yet, but I will try to finish it today

@nickvergessen nickvergessen mentioned this pull request Mar 30, 2015
4 tasks
@nickvergessen nickvergessen force-pushed the limit-file-activities-to-favorites branch from 2ba0bdb to b97565e Compare March 30, 2015 13:11
@nickvergessen
Copy link
Contributor Author

Should be ready, but the tests fail due to missing OC core changes of the linked PR.
So I added a second PR with a changed target branch: #277

@MorrisJobke
Copy link
Contributor

Works 👍

@MorrisJobke
Copy link
Contributor

Core is now ready for this :)

@nickvergessen
Copy link
Contributor Author

Since the fail happens when cleaning up after the test (can not delete the encryption key of the user when it was never created) which will be fixed by a core PR, im merging this.

nickvergessen added a commit that referenced this pull request Apr 9, 2015
@nickvergessen nickvergessen merged commit 0532e3c into master Apr 9, 2015
@nickvergessen nickvergessen deleted the limit-file-activities-to-favorites branch April 9, 2015 08:40
@MorrisJobke MorrisJobke added this to the 8.1-current milestone May 6, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants