KiwiFarms
30d537422b
Merge branch 'quote-post' of https://git.pleroma.social/pleroma/pleroma into ryona-dev
2022-10-23 00:21:22 +03:00
KiwiFarms
c13ce51ed9
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev
2022-10-10 05:47:51 +03:00
dd82fd234f
Merge branch 'release/2.4.4' into mergeback/2.4.4
2022-10-08 22:15:09 -04:00
KiwiFarms
5d43b129ec
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev
2022-09-20 17:12:46 +03:00
ac95b8b4f3
Merge branch 'websocketex' into 'develop'
...
Use Websockex to replace websocket_client
See merge request pleroma/pleroma!3743
2022-09-18 17:09:12 +00:00
6bdf451ce8
Use set of pregenerated RSA keys
...
Randomness is a huge resource sink, so let's just use
a some that we made earlier
2022-09-11 21:33:20 +02:00
KiwiFarms
b374dbdc0a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev
2022-09-05 22:09:33 +03:00
346c130ddc
Merge branch 'fix/user-private-key-generation' into 'develop'
...
User: generate private keys on user creation
See merge request pleroma/pleroma!3737
2022-09-05 15:38:15 +00:00
cd237d22f1
User: generate private keys on user creation
...
This fixes a race condition bug where keys could be regenerated
post-federation, causing activities and HTTP signatures from an user to
be dropped due to key differences.
2022-09-05 03:51:17 +02:00
20347898e2
Merge branch 'fix/federation-context-issues' into 'develop'
...
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects
See merge request pleroma/pleroma!3717
2022-09-04 18:43:36 +00:00
KiwiFarms
32593579a8
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev
2022-09-03 15:14:01 +03:00
e40c221c31
Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'
...
Editing
Closes #1429 , #2859 , and #2288
See merge request pleroma/pleroma!3678
2022-09-03 02:16:42 +00:00
6d148b6637
Use Websockex to replace websocket_client
2022-09-03 02:13:00 +02:00
b439e91f57
Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'"
...
This reverts merge request !3649
2022-09-02 22:35:40 +00:00
01239456a1
Merge branch 'rewrite/integration-test-websocket-client' into 'develop'
...
Rewrite integration-test websocket client with Mint.WebSocket, closes #2812
Closes #2812
See merge request pleroma/pleroma!3649
2022-09-02 19:18:22 +00:00
f459c1260b
Lint
2022-08-19 20:24:24 -04:00
3522852c61
Test that server will disconnect websocket upon token revocation
2022-08-19 20:24:24 -04:00
eb42e90c4f
Use Websockex to replace websocket_client
2022-08-19 20:24:21 -04:00
bb02ee99f5
CommonFixes: more predictable context generation
...
`context` fields for objects and activities can now be generated based
on the object/activity `inReplyTo` field or its ActivityPub ID, as a
fallback method in cases where `context` fields are missing for incoming
activities and objects.
2022-08-15 01:46:55 +02:00
3b6784b1de
CreateGenericValidator: fix reply context fixing
...
Incoming Pleroma replies to a Misskey thread were rejected due to a
broken context fix, which caused them to not be visible until a
non-Pleroma user interacted with the replies.
This fix properly sets the post-fix object context to its parent Create
activity as well, if it was changed.
2022-08-10 02:29:38 +02:00
KiwiFarms
b799870098
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev
2022-08-08 08:43:34 +03:00
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
KiwiFarms
96024f3809
Merge & frontend update
2022-07-13 22:53:59 +03:00
4edc867b87
Merge branch 'develop' into 'from/upstream-develop/tusooa/edits'
...
# Conflicts:
# lib/pleroma/constants.ex
2022-07-03 22:24:57 +00:00
aafd7a687d
Return the corresponding object id in attachment view
2022-06-08 11:45:24 -04:00
01b95d9b6e
Merge remote-tracking branch 'old/feature/1469-webfinger-expanding' into newoldstable
2022-04-05 19:49:44 +03:00
4194559ea6
Fix lint errors
2022-03-20 17:26:07 -06:00
d0c1997d48
Rewrite integration-test websocket client with Mint.WebSocket
2022-03-19 23:33:37 -06:00
ebcda5265b
Format announcements into html
2022-03-08 23:00:51 -05:00
11a1996bf5
Implement update announcement admin api
2022-03-08 20:55:41 -05:00
cf8334dbc1
Add starts_at, ends_at and all_day parameters
2022-03-08 19:12:01 -05:00
fcf3c9057e
Implement visibility filtering for announcements
2022-03-08 18:21:20 -05:00
d7af67012f
Implement first pass of announcement admin api
...
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2836
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/1470
2022-03-08 01:01:27 -05:00
17aa3644be
Copyright bump for 2022
2022-02-25 23:11:42 -07:00
6d710a0f7e
Merge remote-tracking branch 'origin/develop' into quote-post
2022-02-02 12:50:03 -06:00
2d77976305
Add tests for mismatched context in replies
2022-02-02 12:19:35 -06:00
fbdfeb326d
Transmogrifier: fetch quoted post
2022-01-22 18:46:58 -06:00
3fd13b70ec
Test that the target account is re-fetched in move_account
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
eb383ef8d3
Make move_account endpoint process non-existent users properly
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
a17910a6c6
CI: Bump lint stage to elixir-1.12
...
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
2021-10-06 08:11:05 +02:00
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
2021-08-09 10:02:37 +00:00
dd947d9bc8
Add tests for setting :instance, :quarantined_instances
...
No test was done for quarantined instances yet. I added a factory for followers_only notes and checked
* That no followers only post is send when the target server is quarantined
* That a followers only post is send when the target server is not quarantined
2021-08-06 07:59:52 +02:00
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
2021-07-18 11:49:22 -05:00
0b1c05ca1e
Poll notification: trigger PollWorker through common_pipeline
2021-07-18 11:10:23 -05:00
0114754db2
MastodonAPI: Support poll notification
2021-07-17 22:19:38 -05:00
fe4c4a7178
MRF: create MRF.Policy behaviour separate from MRF module
...
Speeds up recompilation by reducing compile-time deps
2021-06-07 14:22:08 -05:00
d5daf59f88
Fix warning for misuse of clear_config/2
...
The old warning message was producing an improperly formatted suggestion.
2021-06-04 15:48:26 -05:00
5c3a0dd26e
factory: Fix article_factory
2021-06-03 19:11:16 +02:00
7ee528925c
expanding WebFinger
2021-05-11 17:54:19 +03:00
8857242c95
removeing corresponding add activity
2021-03-25 13:03:41 +03:00
KiwiFarms
Tusooa Zhu
FloatingGhost
Haelwenn
Hélène
Alexander Tumin
Sean King
Alex Gleason
Haelwenn (lanodan) Monnier
Ilja
Mark Felder
Alexander Strizhakov