minibikini
|
1cc8e94506
|
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Haelwenn
|
131f3219e6
|
Merge branch 'issue/2069' into 'develop'
[#2069] unread_conversation_count
See merge request pleroma/pleroma!2939
|
4 years ago |
|
Egor Kislitsyn
|
fa902867c0
|
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
|
4 years ago |
|
minibikini
|
1bfd8528bb
|
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Egor Kislitsyn
|
76c4e80e5a
|
Merge branch 'develop' into mutes-blocks-pagination
|
4 years ago |
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
4 years ago |
|
Egor Kislitsyn
|
2a475622ee
|
Add Pleroma.Constants.as_local_public/0
|
4 years ago |
|
Egor Kislitsyn
|
4f79bbbc31
|
Add local-only statuses
|
4 years ago |
|
Egor Kislitsyn
|
3985c1b450
|
Fix warnings
|
4 years ago |
|
Alex Gleason
|
83770b7b39
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
4 years ago |
|
feld
|
2013705690
|
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
|
4 years ago |
|
Mark Felder
|
ed61002815
|
Undo API breaking changes
|
4 years ago |
|
Alex Gleason
|
755f58168b
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
4 years ago |
|
Alex Gleason
|
7d8f610720
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
4 years ago |
|
Mark Felder
|
8b20c4d275
|
Missed tests
|
4 years ago |
|
Egor Kislitsyn
|
6734abcbd4
|
Add pagination for Mutes
|
4 years ago |
|
Egor Kislitsyn
|
33f4f39b1c
|
Add pagination for Blocks
|
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 |
