Commit Graph

15 Commits (f0e6cff58365791f3bfa79117351ee2e705d1b6b)

Author SHA1 Message Date
Haelwenn 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'"
4 years ago
Haelwenn (lanodan) Monnier acb03d591b
Insert text representation of hashtags into object["hashtags"]
4 years ago
lain fec1ed802e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
Egor Kislitsyn 0118ccb53c
Add `local` visibility
4 years ago
lain dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
minibikini 1bfd8528bb Merge branch 'develop' into 'feature/local-only-scope'
4 years ago
feld d6907e6e0c Merge branch 'chore/elixir-1.11' into 'develop'
4 years ago
lain 8d251096fe SideEffects: Correctly handle chat messages sent to yourself
4 years ago
Ivan Tashkinov 9ea31b373f Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
4 years ago
Egor Kislitsyn 4f79bbbc31
Add local-only statuses
4 years ago
Egor Kislitsyn 3985c1b450
Fix warnings
4 years ago
feld 2013705690 Merge branch 'feature/gen-magic' into 'develop'
4 years ago
Mark Felder 40f3cdc030 JPEG content_type must be image/jpeg
4 years ago
Mark Felder 409f694e4f Merge branch 'develop' into refactor/locked_user_field
4 years ago
Alexander Strizhakov 7dffaef479
tests consistency
4 years ago