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

Add query based content filter #4851

Merged

Conversation

MrPetovan
Copy link
Collaborator

@MrPetovan MrPetovan commented Apr 17, 2018

Related to #4709

This is just a support PR, the real work is over there: friendica/friendica-addons#586

Nevertheless, it should still be merged before the addon PR because of dependency.

@MrPetovan
Copy link
Collaborator Author

Added the required dependency for the Advanced Content Filter addon.

@MrPetovan
Copy link
Collaborator Author

Can this be merged on the face of it before friendica/friendica-addons#586 is fully reviewed?

@annando
Copy link
Collaborator

annando commented Apr 19, 2018

I had waited, since I wasn't sure if there could be some additional supporting work for the addon needed.

@annando annando merged commit 1046511 into friendica:develop Apr 19, 2018
@MrPetovan
Copy link
Collaborator Author

Of course, that's why I felt I had to ask explicitly for a merge, thanks!

@MrPetovan MrPetovan deleted the task/4709-add-query-based-content-filter branch April 19, 2018 11:41
@MrPetovan MrPetovan added this to the 2018.05 milestone Apr 19, 2018
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.

None yet

2 participants