1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
3c2c32b460
Merge branch 'remake-remodel' into develop
5 years ago
f3791add99
removing with_move parameter
5 years ago
fa4ec17c84
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
...
[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
5 years ago
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
5 years ago
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
5 years ago
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
5 years ago
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
5 years ago
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
5 years ago
05da5f5cca
Update Copyrights
5 years ago
b6fc98d9cd
[ #1560 ] ActivityPubController federation state restrictions adjustments. Adjusted tests.
5 years ago
b4367125e9
[ #1560 ] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
5 years ago
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
764a50f8a6
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
...
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
5 years ago
cc98d010ed
relay list shows hosts without accepted follow
5 years ago
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
5 years ago
32d1e04817
ActivityPub actions & side-effects in transaction
5 years ago
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
5 years ago
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
5 years ago
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
5 years ago
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
5 years ago
b95dd5e217
[ #1505 ] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message.
5 years ago
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
5 years ago
7c3991f59e
[ #1505 ] Fixed `replies` serialization (included objects' ids instead of activities' ids).
5 years ago
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
5 years ago
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
5 years ago
8a79f20c21
EmojiReactions: Rename to EmojiReacts
5 years ago
8c71f7e11a
Add support for cancellation of a follow request
5 years ago
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
a0d9d42eaa
Emoji Reactions: Actually use the validation.
5 years ago
86e4d23acb
[ #1505 ] Background fetching of incoming activities' `replies` collections.
5 years ago
34fc0ca053
Emoji reactions: Add sanity checks for the cache
5 years ago
cf96c40057
[ #1505 ] Added Mastodon-compatible `replies` collection to Note federated representation.
5 years ago
dd3fc50ea4
Emoji reactions: Change cache and reply format
5 years ago
5c533e10e7
Bump credo to 1.1.5
5 years ago
2f5b8fbeb3
Merge branch 'develop' into issue/1354
5 years ago
5b84156013
moved remote follow in separate controller
5 years ago
432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
8f79f433bc
Hide follower counter when hiding is activated
5 years ago
814a99c80f
tests: remove a useless 3 second sleep
...
the ids favs use are accurate down to a microsecond, there is no need
for it
5 years ago
9ef912aecf
Merge branch 'develop' into issue/1411
5 years ago
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
5abee19b63
make analysis happy
5 years ago
19d228cc58
modify SQL to include followed-but-domain-blocked activities
5 years ago
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
5 years ago
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
5 years ago
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
5 years ago
67d8df04a4
Merge branch '1335-user-api-id-fields-relations' into 'develop'
...
[#1335 ] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
5 years ago
lain