fix merge conflict
[akkoma] / lib /
2019-05-23 Sachin Joshifix merge conflict
2019-05-22 kaniiniMerge branch 'feature/mrf-user-filter' into 'develop'
2019-05-22 kaniiniMerge branch 'ssh-fixes' into 'develop'
2019-05-22 William Pitcockmrf: simple policy: add the ability to strip avatars...
2019-05-22 William Pitcockactivitypub: run user objects through MRF filters
2019-05-22 William Pitcockmrf: defang policy modules for filtering user profile...
2019-05-22 rinpatchMerge branch 'fix/prune-objects-times-out' into 'develop'
2019-05-22 rinpatchDisable timeouts for object pruning query
2019-05-22 lambdaMerge branch 'issue/699' into 'develop'
2019-05-22 Maksim[#699] add worker to clean expired oauth tokens
2019-05-22 lambdaMerge branch 'feature/object-pruning' into 'develop'
2019-05-22 lambdaMerge branch 'refactor/keys' into 'develop'
2019-05-22 William Pitcocksalmon: fix credo
2019-05-22 rinpatchMerge branch 'bugfix/account_view_source.note' into...
2019-05-22 Haelwenn (lanodan... MastoAPI AccountView: fill source.note with plaintext...
2019-05-22 Sachin JoshiAbility to reset avatar, profile banner and backgroud
2019-05-22 kaniiniMerge branch 'mongooseim-support' into 'develop'
2019-05-22 kaniiniMerge branch 'fix/api-fallback' into 'develop'
2019-05-22 kaniiniMerge branch 'bugfix/dm-being-truncated' into 'develop'
2019-05-22 Sergey SuprunenkoDo not truncate DM when it contains newlines and safe_d...
2019-05-22 William Pitcockmove key generation functions into Pleroma.Keys module
2019-05-22 William Pitcockprune objects task: use Repo.delete_all()
2019-05-21 Aaron TinioRespond with a 404 Not implemented JSON error message
2019-05-21 William Pitcockadd mix task to prune the object database using a confi...
2019-05-21 William Pitcockobject: fetcher: add support for reinjecting pruned...
2019-05-21 William Pitcockobject: add Object.prune()
2019-05-21 kaniiniMerge branch 'trivial/increase-hackney-timeouts' into...
2019-05-21 William Pitcockhttp: bump connection timeout to 10 seconds
2019-05-21 kaniiniMerge branch 'fix/prometheus-ecto-error-when-not-config...
2019-05-20 kaniiniMerge branch 'refactor/add-virtual-thread-muted-field...
2019-05-20 Aaron TinioFix prometheus-ecto error when not configured
2019-05-20 kaniiniMerge branch 'feature/user-configurable-mascot' into...
2019-05-20 Aaron TinioAdd virtual :thread_muted? field
2019-05-20 SadposterMove default mascot configuration to `config/`
2019-05-20 SadposterUse string map for default mascot
2019-05-20 SadposterAdd mascot get/set tests
2019-05-20 SadposterAdd API endpoints for a custom user mascot
2019-05-19 kaniiniMerge branch 'feature/mrf-simple-report-filtering'...
2019-05-19 Aaron TinioAdd report filtering to MRF.SimplePolicy
2019-05-18 rinpatchMerge branch 'feature/mrf-always-nsfw' into 'develop'
2019-05-18 HaelwennMerge branch 'feature/http-ua-header-always' into ...
2019-05-17 William Pitcockadd Changelog entry
2019-05-17 William Pitcockalso suppress link previews from posts marked #nsfw
2019-05-17 William Pitcockconfig: make sending the user agent configurable, disab...
2019-05-17 William Pitcockhttp: request builder: send user-agent when making...
2019-05-17 William Pitcockrich media: suppress link previews if post is marked...
2019-05-17 William Pitcockmrf: simple policy: mark all posts instead of posts...
2019-05-17 rinpatchMerge branch 'rum-index' into 'develop'
2019-05-17 lainLinting.
2019-05-17 lainMongooseIM: Add basic integration endpoints.
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-17 lambdaMerge branch 'ecto_sql_update' into 'develop'
2019-05-17 lambdaMerge branch 'update-tzdata' into 'develop'
2019-05-17 lambdaMerge branch 'bugfix/903-mastoapi-relationship-requeste...
2019-05-17 lambdaUpdate account_view.ex
2019-05-17 lainFix specs.
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-17 rinpatchMerge branch 'fix/902-random-compile-failing' into...
2019-05-17 Alexander StrizhakovFix/902 random compile failing
2019-05-17 Haelwenn (lanodan... MastoAPI account_view.ex: requested is false when follo...
2019-05-17 kaniiniMerge branch 'fix/mrf-tag-typo' into 'develop'
2019-05-17 Aaron TinioFix typo: s/"tags"/"tag"/g
2019-05-16 kaniiniMerge branch 'feature/890-add-report-uri' into 'develop'
2019-05-16 feldMerge branch 'feature/task-update-following' into ...
2019-05-16 Sergey SuprunenkoRemove duplicated entries in users' following lists
2019-05-16 feldMerge branch 'feature/admin-api-reports' into 'develop'
2019-05-16 Sergey SuprunenkoAdd Reports to Admin API
2019-05-16 feldMerge branch 'fix/domain-unblocked-reblogs' into 'develop'
2019-05-16 rinpatchMerge branch 'conversations-import' into 'develop'
2019-05-16 Mark FelderMove to pleroma.database mix task
2019-05-16 Mark FelderMerge branch 'develop' into conversations-import
2019-05-16 lambdaMerge branch 'feature/sql-thread-sat' into 'develop'
2019-05-16 rinpatchMerge branch 'feature/896-toggling-confirmation' into...
2019-05-16 Alexander StrizhakovFeature/896 toggling confirmation
2019-05-16 Alex SMerge branch 'develop' into feature/890-add-report-uri
2019-05-16 Alex Sadd report uri and report to
2019-05-16 kaniiniMerge branch 'docs/update_debian_instructions' into...
2019-05-16 kaniiniMerge branch 'chore/docs-update' into 'develop'
2019-05-16 kaniiniMerge branch 'fix/slow-federation' into 'develop'
2019-05-16 William Pitcockpublisher: use the correct queue name for outgoing...
2019-05-15 Aaron TinioUse named binding to conditionally join object
2019-05-15 Aaron TinioRestrict reblogs of activities from blocked domains
2019-05-15 William Pitcockactivity pub: remove Ecto SQL query dumps
2019-05-15 William Pitcockchase test failures
2019-05-15 William Pitcockbbs: chase timeline containment patch
2019-05-15 William Pitcockactivitypub: visibility: use SQL thread_visibility...
2019-05-15 William Pitcockactivitypub: remove contain_timeline()
2019-05-15 William Pitcockactivitypub: add restrict_thread_visibility()
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-15 kaniiniMerge branch 'fix/public-option-not-working' into ...
2019-05-15 lambdaMerge branch 'chore/extricate-http-signatures' into...
2019-05-15 kaniiniMerge branch 'prevent-public-answers' into 'develop'
2019-05-15 lambdaMerge branch 'cleanup' into 'develop'
2019-05-15 lainCommonAPI: Visibility refactor.
2019-05-15 lainCommonAPI: Refactor visibility, forbid public to privat...
2019-05-15 lainSearch: Add optional rum indexing / searching.
2019-05-15 rinpatchMerge branch 'legacy-fe-config' into 'develop'
2019-05-15 Sachin Joshiremove deprecated PleromaFE configuration
2019-05-14 Aaron TinioPipe requests to public endpoints through EnsurePublicO...
2019-05-14 Aaron TinioImplement Pleroma.Plugs.EnsurePublicOrAuthenticated
next