a0923b96a0
Fix voters_count in polls from remote Pleroma instances
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-18 23:39:07 +02:00
322e00e45a
Revert "Merge branch 'revert-f6e02270' into 'develop'"
...
This reverts commit 5b8ad6bc91
, reversing
changes made to f6e02270c3
.
2022-08-18 23:06:18 +02:00
marcin mikołajczak
4de58c2b2c
Revert "Merge branch 'polls' into 'develop'"
...
This reverts merge request !152
2022-08-18 06:38:03 +00:00
fa9106bb1b
Merge remote-tracking branch 'soapbox/develop' into polls
2022-08-16 07:42:22 +02:00
95f18a7296
Add tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: marcin mikołajczak <me@mkljczk.pl>
2022-08-15 21:22:06 +02:00
Alex Gleason
dae909ad34
Revert "Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'"
...
This reverts commit 93f12c0d0d
, reversing
changes made to 6ce3f76b5d
.
2022-08-13 14:06:21 -05:00
Alex Gleason
f5713ab575
Tag erratic test
2022-08-13 14:04:21 -05:00
Alex Gleason
55c15ea81e
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
2022-08-13 13:42:11 -05:00
Haelwenn
06f9324afe
Merge branch 'from/upstream-develop/tusooa/2912-receiver-reject-mrf' into 'develop'
...
Treat MRF rejects as success in Oban worker
Closes #2912
See merge request pleroma/pleroma!3720
2022-08-12 01:37:40 +00:00
Haelwenn
93f12c0d0d
Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'
...
Synchronized settings for apps (frontends)
See merge request pleroma/pleroma!3698
2022-08-12 01:34:36 +00:00
Haelwenn
6ce3f76b5d
Merge branch 'from/upstream-develop/floatingghost/follow-state' into 'develop'
...
Backport: bugfix/follow-state
Closes #2902
See merge request pleroma/pleroma!3718
2022-08-12 01:32:20 +00:00
Alex Gleason
2edb44789d
Merge remote-tracking branch 'origin/develop' into odic
2022-08-11 18:17:44 -05:00
Alex Gleason
54838c959f
Expose oauth_consumer_strategies in instance API
2022-08-11 17:58:54 -05:00
Mark Felder
73b4d0d9a7
Fix the mocks to use uppercase as well
2022-08-10 21:46:56 +00:00
Tusooa Zhu
d487e0160c
Treat containment failure as cancel in ReceiverWorker
2022-08-08 08:41:33 -04:00
b4575815ed
Add entry to @context, tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-08 10:45:43 +02:00
Tusooa Zhu
88e0e6acd5
Fix FederatorTest
2022-08-06 00:42:10 -04:00
Tusooa Zhu
a0166e92fa
Treat MRF rejects as success in Oban worker
2022-08-06 00:33:18 -04:00
55c62d19a8
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-03 23:42:48 +02:00
floatingghost
f2a9285ff0
bugfix/follow-state ( #104 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/104
2022-08-03 01:07:53 -04:00
marcin mikołajczak
fdea5d2df6
Merge branch 'stream_markers' into 'develop'
...
Stream marker updates
See merge request soapbox-pub/soapbox-be!144
2022-08-02 07:35:37 +00:00
Haelwenn
b2ba307f4d
Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop'
...
local only fixes
Closes #2871
See merge request pleroma/pleroma!3660
2022-08-02 05:39:50 +00:00
Haelwenn
7299795eb4
Merge branch 'from/upstream-develop/tusooa/backup-without-email' into 'develop'
...
Allow users to create backups without providing email address
See merge request pleroma/pleroma!3665
2022-08-02 05:23:49 +00:00
fe0c02f2c8
Stream marker updates
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-01 19:07:17 +02:00
Haelwenn
5ef2dc317d
Change test case wording
2022-07-31 21:34:23 +00:00
tusooa
c80096522c
Merge branch 'develop' into 'from/develop/tusooa/emit-move'
...
# Conflicts:
# CHANGELOG.md
# test/pleroma/user_test.exs
2022-07-31 21:32:49 +00:00
5d3d6a58f7
Use duration
param for mute expiration duration
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-31 17:22:34 +02:00
Haelwenn
0814d0e0cb
Merge branch 'fix/proper-emoji-qualification' into 'develop'
...
Emoji: implement full-qualifier using combinations
See merge request pleroma/pleroma!3709
2022-07-28 04:46:15 +00:00
Haelwenn
0f9f3d2897
Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'
...
Make mutes and blocks behave the same as other lists
Closes #2384
See merge request pleroma/pleroma!3693
2022-07-28 04:37:10 +00:00
cca794e5fe
Merge remote-tracking branch 'soapbox/develop' into webhooks
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-26 19:12:52 +02:00
965f1de57e
Revert "Document way to do notice compatibility routes with Nginx reverse-proxy instead"
...
This reverts commit 64e16e6a4b
.
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-26 07:12:23 +02:00
a8540c3797
Merge Pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-25 23:51:14 +02:00
Hélène
fb3f6e1975
EmojiReactValidator: use new qualification method
2022-07-25 16:49:23 +02:00
Hélène
388bbc4978
EmojiReactValidator: fix emoji qualification
...
Tries fully-qualifying emoji when receiving them, by adding the emoji
variation sequence to the received reaction emoji.
This issue arises when other instance software, such as Misskey, tries
reacting with emoji that have unqualified or minimally qualified
variants, like a red heart. Pleroma only accepts fully qualified emoji
in emoji reactions, and refused those emoji. Now, Pleroma will attempt
to properly qualify them first, and reject them if checks still fail.
This commit contains changes to tests proposed by lanodan.
Co-authored-by: Haelwenn <contact+git.pleroma.social@hacktivis.me>
2022-07-24 13:36:06 +02:00
tusooa
301ce5bc62
Merge branch 'mute-expiration' into 'develop'
...
MastoAPI: Show mutes expiration date
See merge request pleroma/pleroma!3682
2022-07-23 00:34:15 +00:00
Haelwenn
cfb21d011f
Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'"
...
This reverts merge request !3684
2022-07-22 23:19:49 +00:00
FloatingGhost
09e0304b9c
Add test for broken owncast federation
2022-07-22 20:30:45 +02:00
tusooa
c589b8445f
Merge branch 'birthday_fix' into 'develop'
...
Allow to unset birthday
See merge request pleroma/pleroma!3702
2022-07-21 21:27:16 +00:00
Haelwenn
454f892f37
Merge branch 'fix/emoji-react-qualification' into 'develop'
...
EmojiReactValidator: fix emoji qualification
See merge request pleroma/pleroma!3684
2022-07-21 17:45:47 +00:00
Tusooa Zhu
4350a205a4
Merge remote-tracking branch 'upstream/develop' into HEAD
2022-07-21 13:44:16 -04:00
Haelwenn
1f18ab36b5
Merge branch 'resolve/notice-compatibility-routes-nginx' into 'develop'
...
Document way to do notice compatibility routes with Nginx reverse-proxy, fixes #2900
Closes #2900
See merge request pleroma/pleroma!3701
2022-07-20 16:57:05 +00:00
marcin mikołajczak
8c537f7b99
Merge branch 'quotes-count' into 'develop'
...
Count and display post quotes
See merge request soapbox-pub/soapbox-be!133
2022-07-19 20:02:15 +00:00
fb268c4378
Allow to unset birthday
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-17 19:46:29 +02:00
Haelwenn
bb4860e222
Merge branch 'from/upstream-develop/tusooa/config-translatable' into 'develop'
...
Translatable config descriptions
Closes pleroma-meta#65
See merge request pleroma/pleroma!3695
2022-07-17 17:34:21 +00:00
abe13622e6
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-17 16:08:26 +02:00
Sean King
64e16e6a4b
Document way to do notice compatibility routes with Nginx reverse-proxy instead
2022-07-16 23:44:37 -06:00
tusooa
8aba7c08d1
Merge branch 'notification_types' into 'develop'
...
MastoAPI: Use `types` for filtering notifications
See merge request pleroma/pleroma!3648
2022-07-17 03:17:43 +00:00
597f56b4c4
Use :utc_datetime
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-16 16:28:22 +02:00
Tusooa Zhu
8371fd8ca2
Implement settings api
2022-07-16 01:20:25 -04:00
Tusooa Zhu
1d7e8d6e01
Pass in msgctxt for config translation strings
2022-07-14 17:41:33 -04:00