Commit Graph

23 Commits (45949b5cd315cd57f56fe2110e3164c47f2ccba0)

Author SHA1 Message Date
feld cd1b4155d5 Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
4 years ago
Egor Kislitsyn fb41bd1a85 Hide reactions from muted and blocked users
4 years ago
Alexander Strizhakov 8d218ebaf5
Moving some background jobs into simple tasks
4 years ago
lain 504a829edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
4 years ago
Egor Kislitsyn ca95cbe0b4
Add `with_muted` param to ChatController.index/2
4 years ago
Egor Kislitsyn be52819a11
Hide chats from muted users
4 years ago
feld 38b481d112 Merge branch 'feature/account-export' into 'develop'
4 years ago
eugenijm 8e41baff40 Add idempotency_key to the chat_message entity.
4 years ago
Egor Kislitsyn a2a7a1f2ff
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn 1a98476f48 Remove unused aliases
4 years ago
Haelwenn 131f3219e6 Merge branch 'issue/2069' into 'develop'
4 years ago
Mark Felder 9e54ef086b Merge branch 'develop' into feature/account-export
4 years ago
Egor Kislitsyn ad605e3e16
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
4 years ago
Egor Kislitsyn c1976d5b19 Fix credo warnings
4 years ago
Ivan Tashkinov 9ea31b373f Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
4 years ago
Haelwenn (lanodan) Monnier aafdc975bd
federation_status: Add ApiSpec
4 years ago
Haelwenn (lanodan) Monnier 3b5a7a6b14
federation_status: New endpoint showing unreachable instances
4 years ago
Egor Kislitsyn 3985c1b450
Fix warnings
4 years ago
Mark Felder 40f3cdc030 JPEG content_type must be image/jpeg
4 years ago
Alexander Strizhakov 4c4ea9a348
changes after rebase
4 years ago
Alexander Strizhakov 7acf09beb8
more tests
4 years ago
Alexander Strizhakov 7dffaef479
tests consistency
4 years ago