Maksim Pechnikov
|
7d727dbfec
|
added test
|
5 years ago |
|
lain
|
a88e834dba
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Maksim Pechnikov
|
9d0b989521
|
add subject to atom feed
|
5 years ago |
|
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
lain
|
556da92902
|
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
Store status data inside flag activity
See merge request pleroma/pleroma!1849
|
5 years ago |
|
Maxim Filippov
|
791bcfd90f
|
Merge branch 'develop' into feature/store-statuses-data-inside-flag
|
5 years ago |
|
Maxim Filippov
|
8eff05d4c6
|
Strip status data from Flag (when federating or closing/resolving report)
|
5 years ago |
|
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
5 years ago |
|
Maxim Filippov
|
b08b1d5d91
|
Store status data inside Flag activity
|
5 years ago |
|
Ivan Tashkinov
|
a11a7176d5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
|
5 years ago |
|
Egor Kislitsyn
|
4ea1a61b00
|
Merge branch 'develop' into refactor/following-relationships
|
5 years ago |
|
Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
5 years ago |
|
Ariadne Conill
|
80d3912a56
|
test: activitypub: use User.invisible?/1 for testing invisibility
|
5 years ago |
|
Ariadne Conill
|
ef659331b0
|
implement invisible support for remote users
|
5 years ago |
|
eugenijm
|
359dd1890e
|
Mastodon API: Mark the conversation as read for the author when they send a new direct message
|
5 years ago |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
|
eugenijm
|
a97b642289
|
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
|
5 years ago |
|
Egor Kislitsyn
|
059005ff82
|
Replace `user.following` with Pleroma.FollowingRelationship
|
5 years ago |
|
lain
|
d9aaea44ff
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
lain
|
568a995d64
|
ActivityPub: Change addressing of Undo.
|
5 years ago |
|
lain
|
dfe5c958eb
|
ActivityPub: Add undo for emoji reactions.
|
5 years ago |
|
lain
|
557223b2b5
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
Thibaut Girka
|
e0b654e202
|
Add tests
|
5 years ago |
|
lain
|
19bc0b8c79
|
.
|
5 years ago |
|
lain
|
08256e9299
|
ActivityPub: Federate reactions.
|
5 years ago |
|
lain
|
b923842e96
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
Ariadne Conill
|
1f9de2a8cd
|
activitypub: implement IR-level considerations for Listen activities
|
5 years ago |
|
Maxim Filippov
|
60cbea5bb2
|
Allow activities pagination via limit/offset
|
5 years ago |
|
Egor Kislitsyn
|
96816ceaa2
|
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
|
5 years ago |
|
kaniini
|
c623b4324d
|
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
|
5 years ago |
|
Steven Fuchs
|
aab264db82
|
Streamer refactoring
|
5 years ago |
|
lain
|
9bc12b88b3
|
ActivityPub: Save emoji reactions in object.
|
5 years ago |
|
Ivan Tashkinov
|
e890ea7e82
|
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
5 years ago |
|
lain
|
f017260cdc
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
Maksim Pechnikov
|
00abe099cd
|
added tests for ActivityPub.like\unlike
|
5 years ago |
|
lain
|
6e1ec4c5da
|
ActivityPub: Basic EmojiReactions.
|
5 years ago |
|
Ivan Tashkinov
|
256ff09aa8
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
|
5 years ago |
|
Maksim Pechnikov
|
85bd8a4e31
|
fixed clear config after test
|
5 years ago |
|
Ariadne Conill
|
a2fdc32368
|
tests: activitypub: fix typo
|
5 years ago |
|
rinpatch
|
a4a3e3becd
|
Hide muted theads from home/public timelines unless `with_muted` is set
|
5 years ago |
|
rinpatch
|
32018a4ee0
|
ActivityPub tests: remove assertions of embedded object being updated,
because the objects are no longer supposed to be embedded
|
5 years ago |
|
rinpatch
|
301ea0dc04
|
Add tests for counters being updated on follow
|
5 years ago |
|
rinpatch
|
41e0304757
|
Merge branch 'develop' into feature/hide-follows-remote
|
5 years ago |
|
Maksim
|
c49a09ed88
|
tests for Pleroma.Web.ActivityPub.Publisher
|
5 years ago |
|
rinpatch
|
196cad46f3
|
Resolve merge conflicts
|
5 years ago |
|
rinpatch
|
0c2dcb4c69
|
Add follow information refetching after following/unfollowing
|
5 years ago |
|
rinpatch
|
183da33e00
|
Add tests for fetch_follow_information_for_user and check object type
when fetching the page
|
5 years ago |
|
Egor Kislitsyn
|
182f7bbb11
|
Merge branch 'develop' into feature/addressable-lists
|
5 years ago |
|
Ivan Tashkinov
|
8a41d34673
|
[#878] Tests improvements per code review.
|
5 years ago |
|
Ivan Tashkinov
|
6fc0c27be3
|
[#878] Uncommented test statement.
|
5 years ago |
