summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-17MastoAPI account_view.ex: requested is false when following is trueHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
2019-05-17Merge branch 'fix/mrf-tag-typo' into 'develop'kaniini
Fix MRF "tag" typo See merge request pleroma/pleroma!1167
2019-05-17Add tests for MRF.SimplePolicyAaron Tinio
2019-05-17Fix typo: s/"tags"/"tag"/gAaron Tinio
2019-05-16Merge branch 'feature/890-add-report-uri' into 'develop'kaniini
Feature/890 add report uri Closes #890 See merge request pleroma/pleroma!1164
2019-05-16Merge branch 'feature/task-update-following' into 'develop'feld
Remove duplicated entries in users' following lists Closes #888 See merge request pleroma/pleroma!1166
2019-05-16Remove duplicated entries in users' following listsSergey Suprunenko
2019-05-16Merge branch 'feature/admin-api-reports' into 'develop'feld
Add Reports to Admin API Closes #774 See merge request pleroma/pleroma!1107
2019-05-16Add Reports to Admin APISergey Suprunenko
2019-05-16Merge branch 'fix/domain-unblocked-reblogs' into 'develop'feld
Fix domain-unblocked reblogs Closes #892 See merge request pleroma/pleroma!1157
2019-05-16Merge branch 'conversations-import' into 'develop'rinpatch
Conversations import Closes #871 See merge request pleroma/pleroma!1127
2019-05-16Update CHANGELOGMark Felder
2019-05-16Move to pleroma.database mix taskMark Felder
2019-05-16Merge branch 'develop' into conversations-importMark Felder
2019-05-16Merge branch 'feature/sql-thread-sat' into 'develop'lambda
SQL thread visibility solver See merge request pleroma/pleroma!971
2019-05-16Merge branch 'feature/896-toggling-confirmation' into 'develop'rinpatch
Feature/896 toggling confirmation Closes #896 See merge request pleroma/pleroma!1165
2019-05-16Feature/896 toggling confirmationAlexander Strizhakov
2019-05-16try thisAlex S
2019-05-16trailing spacesAlex S
2019-05-16Merge branch 'develop' into feature/890-add-report-uriAlex S
2019-05-16add report uri and report toAlex S
2019-05-16Merge branch 'docs/update_debian_instructions' into 'develop'kaniini
Added package to dependency list documentation See merge request pleroma/pleroma!1161
2019-05-16Merge branch 'chore/docs-update' into 'develop'kaniini
Update Admin API docs See merge request pleroma/pleroma!1162
2019-05-16Merge branch 'fix/slow-federation' into 'develop'kaniini
publisher: use the correct queue name for outgoing federation See merge request pleroma/pleroma!1163
2019-05-16publisher: use the correct queue name for outgoing federationWilliam Pitcock
2019-05-16Note that nicknames is an arrayAngelina Filippova
2019-05-16Note that nicknames is an arrayAngelina Filippova
2019-05-16Update tag/untag docsAngelina Filippova
2019-05-15Added package to dependency listPolymerWitch
Added the erlang-ssh package to the dependency list and the installation command instructions. The project wouldn't build otherwise.
2019-05-16Use named binding to conditionally join objectAaron Tinio
2019-05-16Restrict reblogs of activities from blocked domainsAaron Tinio
2019-05-16Add test for blocked domainsAaron Tinio
2019-05-15thread visibility function: fix use of no longer used author variableWilliam Pitcock
2019-05-15activity pub: remove Ecto SQL query dumpsWilliam Pitcock
2019-05-15thread visibility function: significantly improve efficiencyWilliam Pitcock
2019-05-15chase test failuresWilliam Pitcock
2019-05-15update migrationWilliam Pitcock
2019-05-15bbs: chase timeline containment patchWilliam Pitcock
2019-05-15migration: only care about Create activitiesWilliam Pitcock
2019-05-15test: update obsolete testWilliam Pitcock
2019-05-15activitypub: visibility: use SQL thread_visibility() function instead of ↵William Pitcock
manually walking the thread
2019-05-15activitypub: remove contain_timeline()William Pitcock
2019-05-15activitypub: add restrict_thread_visibility()William Pitcock
2019-05-15migrations: add function to see if a thread can be satisfiedWilliam Pitcock
2019-05-15Merge remote-tracking branch 'origin/develop' into conversations-importlain
2019-05-15Merge branch 'fix/public-option-not-working' into 'develop'kaniini
Fix public option not working Closes #873 See merge request pleroma/pleroma!1143
2019-05-15Merge branch 'chore/extricate-http-signatures' into 'develop'lambda
switch to pleroma/http_signatures library See merge request pleroma/pleroma!1155
2019-05-15tests: fixupWilliam Pitcock
2019-05-15Merge branch 'prevent-public-answers' into 'develop'kaniini
Prevent public answers to direct messages See merge request pleroma/pleroma!1159
2019-05-15Merge branch 'cleanup' into 'develop'lambda
Remove unused queue from the config See merge request pleroma/pleroma!1158