feld
|
10b7b2b4a4
|
Merge branch 'fix/activity-deletion' into 'develop'
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
|
5 years ago |
Haelwenn
|
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 |
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
5 years ago |
Alexander Strizhakov
|
32d1e04817
|
ActivityPub actions & side-effects in transaction
|
5 years ago |
Ivan Tashkinov
|
4f8c3462a8
|
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
|
5 years ago |
Haelwenn
|
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 |
Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
5 years ago |
Egor Kislitsyn
|
8c71f7e11a
|
Add support for cancellation of a follow request
|
5 years ago |
lain
|
dd3fc50ea4
|
Emoji reactions: Change cache and reply format
|
5 years ago |
Egor Kislitsyn
|
432b3067d4
|
Do not crash when remote user follower and following counters are hidden
|
5 years ago |
rinpatch
|
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 |
Mark Felder
|
9ef912aecf
|
Merge branch 'develop' into issue/1411
|
5 years ago |
Sadposter
|
8cfaab8f04
|
Merge branch 'develop' into 'domain-block-precedence'
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
Sadposter
|
5abee19b63
|
make analysis happy
|
5 years ago |
Sadposter
|
19d228cc58
|
modify SQL to include followed-but-domain-blocked activities
|
5 years ago |
rinpatch
|
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 |
rinpatch
|
cdff5b8267
|
Merge branch 'develop' into fix/mrf-delete
|
5 years ago |
rinpatch
|
9f99640cfc
|
ActivityPub: Fix deletes being exempt from MRF
Closes #1461
|
5 years ago |
Maksim Pechnikov
|
e21afdb7c7
|
Merge branch 'develop' into issue/1411
|
5 years ago |
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
Egor Kislitsyn
|
624e720aa4
|
Add `with_move` query param to the notifications API
|
5 years ago |
lain
|
7722e5a67a
|
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
5 years ago |
Maksim Pechnikov
|
88f7cf51d4
|
Merge branch 'develop' into issue/1411
|
5 years ago |
kPherox
|
1915b23e72
|
test missing first field
|
5 years ago |
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
5 years ago |
Maksim Pechnikov
|
708fd234bd
|
fix order favorites activites
|
5 years ago |
Maksim Pechnikov
|
7d727dbfec
|
added test
|
5 years ago |
Ivan Tashkinov
|
01d9c093c3
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
5 years ago |
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized `users.mutes` as relation to UserMute entity.
|
5 years ago |
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
5 years ago |
Egor Kislitsyn
|
27cd1374e3
|
Add a notification for Move activities
|
5 years ago |
Egor Kislitsyn
|
e6d7e27bd6
|
Add `allow_following_move` setting to User
|
5 years ago |
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
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 |
Egor Kislitsyn
|
61fc739ab8
|
Handle "Move" activity
|
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 |