lain
|
91f6c32430
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
|
2020-11-03 13:45:09 +01:00 |
|
Egor Kislitsyn
|
1a98476f48
|
Remove unused aliases
|
2020-10-30 18:42:43 +04:00 |
|
|
|
1042c30fa5
|
ConversationViewTest: fix test
|
2020-10-30 13:59:53 +01:00 |
|
|
|
0552a08dfd
|
ConversationControllerTest: fix test, fix formatting
|
2020-10-30 13:59:53 +01:00 |
|
|
|
9b93eef715
|
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
|
2020-10-30 13:59:53 +01:00 |
|
|
|
630eb0f939
|
ConversationViewTest: fix test #2
|
2020-10-30 12:58:51 +01:00 |
|
|
|
149589c842
|
ConversationViewTest: fix test
|
2020-10-30 12:58:51 +01:00 |
|
|
|
390a12d4c8
|
ConversationControllerTest: fix test
|
2020-10-30 12:58:51 +01:00 |
|
minibikini
|
1cc8e94506
|
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
|
2020-10-30 11:18:55 +00:00 |
|
Haelwenn
|
131f3219e6
|
Merge branch 'issue/2069' into 'develop'
[#2069] unread_conversation_count
See merge request pleroma/pleroma!2939
|
2020-10-29 23:39:15 +00:00 |
|
Egor Kislitsyn
|
fa902867c0
|
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
|
2020-10-29 15:35:42 +04:00 |
|
minibikini
|
1bfd8528bb
|
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
|
2020-10-27 18:59:19 +00:00 |
|
lain
|
04b7505c75
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
|
2020-10-26 17:50:34 +01:00 |
|
Egor Kislitsyn
|
76c4e80e5a
|
Merge branch 'develop' into mutes-blocks-pagination
|
2020-10-19 15:40:03 +04:00 |
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
2020-10-17 17:53:47 +03:00 |
|
Egor Kislitsyn
|
2a475622ee
|
Add Pleroma.Constants.as_local_public/0
|
2020-10-15 19:07:00 +04:00 |
|
Egor Kislitsyn
|
4f79bbbc31
|
Add local-only statuses
|
2020-10-15 18:37:44 +04:00 |
|
Egor Kislitsyn
|
3985c1b450
|
Fix warnings
|
2020-10-15 16:54:59 +04:00 |
|
Alex Gleason
|
83770b7b39
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
2020-10-14 12:33:24 -05:00 |
|
|
|
2013705690
|
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
|
2020-10-14 17:31:45 +00:00 |
|
Mark Felder
|
ed61002815
|
Undo API breaking changes
|
2020-10-14 11:03:17 -05:00 |
|
Alex Gleason
|
755f58168b
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
2020-10-13 19:26:04 -05:00 |
|
Alex Gleason
|
7d8f610720
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
2020-10-13 19:25:18 -05:00 |
|
Alex Gleason
|
b3d6cf9022
|
Merge remote-tracking branch 'upstream/develop' into block-behavior
|
2020-10-13 19:22:32 -05:00 |
|
Mark Felder
|
8b20c4d275
|
Missed tests
|
2020-10-13 16:15:28 -05:00 |
|
Egor Kislitsyn
|
6734abcbd4
|
Add pagination for Mutes
|
2020-10-13 21:58:18 +04:00 |
|
Egor Kislitsyn
|
33f4f39b1c
|
Add pagination for Blocks
|
2020-10-13 21:39:41 +04:00 |
|
Mark Felder
|
40f3cdc030
|
JPEG content_type must be image/jpeg
|
2020-10-13 10:37:24 -05:00 |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
2020-10-13 09:54:29 -05:00 |
|
Alexander Strizhakov
|
7dffaef479
|
tests consistency
|
2020-10-13 16:35:09 +03:00 |
|
