Commit Graph

273 Commits (ba5e14be05c78a8905747d7c9930b3b23a9bdb18)

Author SHA1 Message Date
lain cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
lain ef43016b2c Merge branch 'feature/custom-fields' into 'develop'
5 years ago
lain 7ab2dbbdb6 Merge branch 'pleroma-conversations' into 'develop'
5 years ago
rinpatch 1ad71592ad Parallelize template rendering
5 years ago
rinpatch bd5ad0af78 Cache follow state
5 years ago
lain 560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Egor Kislitsyn f7bbf99caa Use info.fields instead of source_data for remote users
5 years ago
Egor Kislitsyn e0ac5c7a66 Add custom profile fields
5 years ago
rinpatch c1b6952d2a Mastodon API: Preloading and normalization optimizations
5 years ago
lain 511ccea5aa ConversationView: Align parameter names with other views.
5 years ago
lain 23c46f7e72 Conversations: Use 'recipients' for accounts in conversation view.
5 years ago
kaniini 84808e1697 Merge branch 'develop' into 'fix/hide-follows-counters'
5 years ago
rinpatch 0802a08871 Mastodon API: Fix thread mute detection
5 years ago
rinpatch 409bcad54b Mastodon API: Set follower/following counters to 0 when hiding
5 years ago
lain a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Thibaut Girka 9c0da1009a Return profile URL in MastodonAPI's `url` field
5 years ago
Thibaut Girka 089d53a961 Simplify logic to mention.js `url` field
5 years ago
Thibaut Girka a10c840aba Return profile URL when available instead of actor URI for MastodonAPI mention URL
5 years ago
lain 3af6d14da7 Pleroma Conversations API: Add a way to set recipients.
5 years ago
lain 7483679a7b StatusView: Return direct conversation id.
5 years ago
Sergey Suprunenko b20020da16 Show the url advertised in the Activity in the Status JSON response
5 years ago
Eugenij 4504135894 Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
5 years ago
Mike Verdone 2c83eb0b15 Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
5 years ago
Mike Verdone 2981821db8 squash! Expose expires_at datetime in mastoAPI only for the activity actor
5 years ago
Mike Verdone 3cb471ec06 Expose expires_at datetime in mastoAPI only for the activity actor
5 years ago
Eugenij 520ee6c591 Add `pleroma.deactivated` to the Account entity (Mastodon API)
5 years ago
Eugenij c4ca142e14 Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
5 years ago
lain 1ed24bcc76 Status View: Poll ids are strings.
5 years ago
Alexander Strizhakov e7c39b7ac8 Feature/1072 muting notifications
5 years ago
Sergey Suprunenko ff55e3c16f Create mentions only for explicitly mentioned users
5 years ago
Maksim 008c55e4e9 add test for search_controller/ 100% coverage
5 years ago
feld 93a0eeab16 Add license/copyright to all project files
5 years ago
rinpatch 72b88c82bc Mastodon API: Fix embedded relationships not being rendered inside of statuses
5 years ago
rinpatch c7acca2abb Mastodon API: Sanitize display names
5 years ago
lain a440cf856d Mastodon API: Return the token needed for the chat.
5 years ago
lain 5965efb216 AccountView: Add user background.
5 years ago
Maksim Pechnikov 4f2e359687 Merge branch 'develop' into issue/941
5 years ago
kaniini 9d2563a3de Merge branch 'generic-fe-settings' into 'develop'
5 years ago
Maksim Pechnikov f13d6c7f78 update api to set skip_thread_containment
5 years ago
rinpatch dc91bcc0af Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
lambda 314758c25b Merge branch 'align-mastodon-conversations' into 'develop'
5 years ago
rinpatch 1fd8e19d76 Remove a TODO comment as the tests for poll view were written
5 years ago
rinpatch 444406167b Mastodon API: actually check for poll votes
5 years ago
rinpatch 65db5e9f52 Resolve merge conflicts
5 years ago
lain aaad85c4d9 AccountView: settings -> settings_store
5 years ago
lain eb2963bc43 User: Add settings store to Info, AccountView
5 years ago
lain 97fb50d9fa Mastodon Conversation API: Don't return own account in 'accounts'.
5 years ago
Sergey Suprunenko 1690be991e Replace missing non-nullable Card attributes with empty strings
5 years ago
rinpatch e6b175ed6c Fix credo issues
5 years ago
rinpatch cdac5efd10 Merge branch 'bugfix/account_view_source.note' into 'develop'
5 years ago