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
|
6f9d3d30fa
|
AdminAPI: Omit relay user from users list
|
5 years ago |
|
kPherox
|
0c361eeb25
|
Add pending to handle incoming for Follow 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
|
c0246309a5
|
[#1304] Extra bullet-proofing.
|
5 years ago |
|
Ivan Tashkinov
|
8cc809e44e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
|
5 years ago |
|
Ariadne Conill
|
3f6a596922
|
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
|
5 years ago |
|
Ivan Tashkinov
|
7c7f90bc4f
|
[#1304] Merged `develop`, handled User.Info.invisible.
|
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
|
c6fba62666
|
Fix Relay
|
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 |
|
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
5 years ago |
|
Ariadne Conill
|
c9280b9730
|
rework to use properties instead of compound typing, per SocialCG
|
5 years ago |
|
Ariadne Conill
|
ef659331b0
|
implement invisible support for remote users
|
5 years ago |
|
Ariadne Conill
|
1469a084d4
|
relay: set invisible to true
|
5 years ago |
|
Maxim Filippov
|
019147f115
|
Merge branch 'develop' into feature/relay-list
|
5 years ago |
|
Ariadne Conill
|
bae96de273
|
activitypub: tag containment checks for better error tracing
|
5 years ago |
|
Ariadne Conill
|
48059c03c9
|
fix up some tests
|
5 years ago |
|
Ariadne Conill
|
adb639db56
|
publisher: move remote_users() from Salmon module
|
5 years ago |
|
Ariadne Conill
|
4f82e42e4e
|
websub: remove entirely
|
5 years ago |
|
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
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 |
|
lain
|
6977cddff9
|
Merge branch 'benchmark-finishing' into 'develop'
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
|
5 years ago |
|
Maxim Filippov
|
90d516d42b
|
Store status data inside flag activity
|
5 years ago |
|
eugenijm
|
a97b642289
|
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
|
5 years ago |
|
Maxim Filippov
|
cc6875b582
|
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
|
5 years ago |
|
lain
|
37812740c4
|
Transmogrifier: Correctly save incoming ids for Accept/Reject.
|
5 years ago |
|
lain
|
9b963064eb
|
Transmogrifier: Actually store who deleted a note.
|
5 years ago |
|
Egor Kislitsyn
|
059005ff82
|
Replace `user.following` with Pleroma.FollowingRelationship
|
5 years ago |
|
lain
|
29647dfd09
|
Transmogrifier: Save correct ids for incoming deletes.
|
5 years ago |
|
lain
|
c54ae662dc
|
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
|
5 years ago |
|
Ariadne Conill
|
9a2f71f4d5
|
mastodon api: fix exclude_replies (closes #1287)
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
58aeabd020
|
mrf/simple_policy: check actor against accept/reject
|
5 years ago |
|
rinpatch
|
fefbd31c6e
|
Move local keys out of `user.info`
|
5 years ago |
|
kaniini
|
45b7f03f89
|
Merge branch 'accept-embedded-announce-object' into 'develop'
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
|
5 years ago |
|
lain
|
4b8524f392
|
ActivityPub / Transmogrifier: Correctly store incoming Update id.
|
5 years ago |
|
Thibaut Girka
|
791d93ff0e
|
Make credo happy
|
5 years ago |
|
Thibaut Girka
|
977e711e22
|
Import object from self-Announce whenever possible
|
5 years ago |
|
Maksim Pechnikov
|
83631752af
|
removed legacy api: "/objects/:uuid/likes"
|
5 years ago |
|
lain
|
568a995d64
|
ActivityPub: Change addressing of Undo.
|
5 years ago |
|
Thibaut Girka
|
86880b9821
|
Inline object when Announcing a self-owned private object
|
5 years ago |
|
Thibaut Girka
|
427d0c2a00
|
Store private announcements in object.data["announcements"], filter them on display
|
5 years ago |
|
Thibaut Girka
|
fe538973dd
|
Ensure self-announces do not widen the audience of the original post
|
5 years ago |
|
KokaKiwi
|
1f0be71ea4
|
Make activity announceable by its author.
|
5 years ago |
|
Egor Kislitsyn
|
2dad6dd020
|
Extract apps actions from `MastodonAPIController` to `AppController`
|
5 years ago |
