Commit Graph

3629 Commits (93e9c0cedf0e2b4ab5966832cc912369c7aaf3ad)

Author SHA1 Message Date
Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
5 years ago
Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
Ivan Tashkinov e8843974cb [#1304] Moved remaining fields from User.Info to User.
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
Haelwenn f01dbc450c Merge branch 'feature/mastofe-pwa' into 'develop'
5 years ago
eugenijm 52ed2f8f2d Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
KokaKiwi 638457ba94 MastoFE: Add PWA manifest.
5 years ago
Mark Felder dcb23a85b6 Merge branch 'develop' into feature/push-subject-for-dm
5 years ago
Mark Felder 152caef51d Direct messages should provide a distinct push notification subject
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 d379b48769 kill almost all of the OStatus module
5 years ago
Ariadne Conill 6a1f4c5145 federator: remove OStatus incoming document support
5 years ago
Ariadne Conill 835ad52378 remove Salmon module
5 years ago
Ariadne Conill beb9861f9d router: disconnect Salmon
5 years ago
Ariadne Conill a7b92bba68 webfinger: stop pulling Salmon data out of WebFinger
5 years ago
Ariadne Conill c00ae10af8 feed: don't advertise salmon endpoint
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
Ariadne Conill b16a460916 federator: remove websub stuff
5 years ago
Maxim Filippov 2473702be2 Merge branch 'develop' into feature/relay-list
5 years ago
kaniini 7511f3d192 Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
5 years ago
kaniini 733b73b71c Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
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
Maksim Pechnikov 66b5d0ff55 add Markers /api/v1/markers
5 years ago
Ivan Tashkinov 10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
feld 21f0757b0d Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
5 years ago
lain 6977cddff9 Merge branch 'benchmark-finishing' into 'develop'
5 years ago
Maxim Filippov da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
Maxim Filippov 90d516d42b Store status data inside flag activity
5 years ago
Alexander e7bb762ec2
don't stream in benchmark env
5 years ago
kPherox 5bd0717de2
Add `Sec-WebSocket-Protocol` to response header
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
Maxim Filippov c0aca32dd0 Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
Maxim Filippov aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
lain 422aa6befe Ostatus DeleteHandler: Fix for new option format.
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
Maxim Filippov f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
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
Maxim Filippov ad42837244 Ability to toggle activation status and permission group for a group of users
5 years ago
eugenijm 580a67f5ca Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
Ariadne Conill 9a2f71f4d5 mastodon api: fix exclude_replies (closes #1287)
5 years ago
Sergey Suprunenko 4b3f77a99f Extract RSS Feed functionality from OStatus
5 years ago
kaniini 93bdc55306 Merge branch 'mrf/simple_policy/check_actor' into 'develop'
5 years ago
Ivan Tashkinov 28fb98d69e Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Haelwenn b4f3c16885 Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
Ivan Tashkinov b93856874d [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
rinpatch fefbd31c6e Move local keys out of `user.info`
5 years ago
Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Ivan Tashkinov f459aabdfa Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Haelwenn 9e34919dcd Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
5 years ago
kaniini 7a318d74e6 Merge branch 'split-masto-api/leftovers' into 'develop'
5 years ago
kaniini 45b7f03f89 Merge branch 'accept-embedded-announce-object' into 'develop'
5 years ago
kaniini 17ff4b43cb Merge branch 'unread-conversation-count' into 'develop'
5 years ago
eugenijm 8249924485 Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain 276a520163 CommonAPI: Create profile updates as public.
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
kaniini e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
5 years ago
Maksim Pechnikov 83631752af removed legacy api: "/objects/:uuid/likes"
5 years ago
kaniini e0c0ea9f13 Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
5 years ago
kaniini 5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop'
5 years ago
Ariadne Conill d1d058bf85 streamer: worker: actually use should_send? consistently
5 years ago
Ariadne Conill 5a0c018d2a streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
5 years ago
Ariadne Conill 2417b633ed streamer: add missing copyright headers
5 years ago
lain 568a995d64 ActivityPub: Change addressing of Undo.
5 years ago
lain 01da6344b9 Merge branch 'bugfix/notification-nil-actor' into 'develop'
5 years ago
Egor Kislitsyn d3ac4e8083
Fix OAuthController
5 years ago
Haelwenn (lanodan) Monnier 5dc14c89ce
notification_view.ex: Make sure `account` isn’t empty
5 years ago
eugenijm 06d9df79c5 Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Egor Kislitsyn e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController
5 years ago
Egor Kislitsyn 7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController
5 years ago
Egor Kislitsyn d3c404af12
Add MastoFEController
5 years ago
Egor Kislitsyn 1c6e1055c8
Add CustomEmojiController
5 years ago
kaniini 433f2c0f68 Merge branch 'split-masto-api/instance' into 'develop'
5 years ago
kaniini debd0a3066 Merge branch 'accept-embedded-announce-object' into 'develop'
5 years ago
Thibaut Girka 86880b9821 Inline object when Announcing a self-owned private object
5 years ago
Thibaut Girka 3d61efa7c9 Rename misleading `get_announce_visibility` to `public_announce?`
5 years ago
Egor Kislitsyn c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
5 years ago
kaniini 89ab673d00 Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
5 years ago
kaniini 8557176808 Merge branch 'split-masto-api/auth' into 'develop'
5 years ago
kaniini 9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop'
5 years ago
feld 1255ec888d Revert "Add upload limits to /api/v1/instance"
5 years ago
Thibaut Girka 427d0c2a00 Store private announcements in object.data["announcements"], filter them on display
5 years ago
Thibaut Girka 43e3db0951 Fix returned visibility of announces in MastodonAPI
5 years ago
Thibaut Girka 4c1f158f5d Allow users to announce privately, including own private notes
5 years ago
Maxim Filippov b2273c695e Discard identifier, if empty
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
Maxim Filippov 0f9c2c8b87 Send an identifier alongside with error message in OAuthController
5 years ago