3eaa5335c9
Revert adding extra alert types here
2020-11-17 21:37:17 +00:00
d9732fb7d3
Fix incorrect test description
2020-11-17 21:34:18 +00:00
ff7a4b6aa2
Test that we ignore invalid subscription alert types separately.
2020-11-17 20:22:25 +00:00
30f140e570
Ensure all supported push notification subscription alert types are tested
2020-11-17 20:22:25 +00:00
67a6abd071
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
2020-11-17 20:20:00 +00:00
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
2020-11-17 18:29:52 +04:00
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-17 15:01:38 +01:00
b1466661eb
Use absolute URLs to thumbnail and background in /api/v1/instance
2020-11-16 21:29:15 +00:00
fb41bd1a85
Hide reactions from muted and blocked users
2020-11-16 22:50:14 +04:00
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
2020-11-13 13:35:47 +00:00
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
2020-11-13 13:35:46 +00:00
2254e5e595
Render blurhashes in Mastodon API
2020-11-11 12:51:13 -06:00
0118ccb53c
Add `local` visibility
2020-11-11 18:54:01 +04:00
8d218ebaf5
Moving some background jobs into simple tasks
...
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
2020-11-11 13:39:49 +03:00
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
2020-11-04 16:51:42 +01:00
bae48c98e3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
2020-11-04 16:18:11 +01:00
5db4c823b2
Merge branch 'restrict-domain' into 'develop'
...
View a remote server's timeline
See merge request pleroma/pleroma!2713
2020-11-04 14:54:53 +00:00
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
2020-11-04 15:05:01 +01:00
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-04 11:47:41 +01:00
1cfc3278c0
Poll View: Always return `voters_count`.
2020-11-04 10:14:00 +01:00
c37118e6f2
Conversations: A few refactors
2020-11-03 13:56:12 +01:00
91f6c32430
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
2020-11-03 13:45:09 +01:00
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
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-30 11:18:55 +00:00
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
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
2020-10-29 15:35:42 +04:00
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 18:59:19 +00:00
04b7505c75
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
2020-10-26 17:50:34 +01:00
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
2020-10-19 15:40:03 +04:00
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
2020-10-17 17:53:47 +03:00
2a475622ee
Add Pleroma.Constants.as_local_public/0
2020-10-15 19:07:00 +04:00
4f79bbbc31
Add local-only statuses
2020-10-15 18:37:44 +04:00
3985c1b450
Fix warnings
2020-10-15 16:54:59 +04:00
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
ed61002815
Undo API breaking changes
2020-10-14 11:03:17 -05:00
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-10-13 19:26:04 -05:00
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-13 19:25:18 -05:00
b3d6cf9022
Merge remote-tracking branch 'upstream/develop' into block-behavior
2020-10-13 19:22:32 -05:00
8b20c4d275
Missed tests
2020-10-13 16:15:28 -05:00
6734abcbd4
Add pagination for Mutes
2020-10-13 21:58:18 +04:00
33f4f39b1c
Add pagination for Blocks
2020-10-13 21:39:41 +04:00
40f3cdc030
JPEG content_type must be image/jpeg
2020-10-13 10:37:24 -05:00
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
7dffaef479
tests consistency
2020-10-13 16:35:09 +03:00
Mark Felder