lain
7e488cd4a7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
lain
d772361e62
Merge branch 'fix/1787-mogrify-args' into 'develop'
...
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
4 years ago
rinpatch
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
4 years ago
Haelwenn
b536e57124
Merge branch '1866-last-status-stuff' into 'develop'
...
Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes #1866
See merge request pleroma/pleroma!2647
4 years ago
Alexander Strizhakov
3c2cee33ad
moving custom ecto types in context folders
4 years ago
Alexander Strizhakov
e1603ac8fe
fix attemps to merge map
4 years ago
Alexander Strizhakov
23decaab81
fix for updated hackney
...
warning: :hackney_connect.partial_chain/1 is undefined or private
4 years ago
Alexander Strizhakov
9a4fde9766
Mogrify args as custom tuples
4 years ago
lain
015f9258a9
Transmogrifier: Extract user update handling tests.
4 years ago
Egor Kislitsyn
bd63089a63
Fix tests
4 years ago
Egor Kislitsyn
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain
b7df7436c8
Conversations: Return last dm for conversation, not last message.
4 years ago
eugenijm
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
rinpatch
271ea5068f
Merge branch '1851-favorites-pagination' into 'develop'
...
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
4 years ago
href
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
Egor Kislitsyn
520367d6fd
Fix atom leak in Rich Media Parser
4 years ago
Haelwenn
4115701f71
Merge branch 'recipients-experiments' into 'develop'
...
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
4 years ago
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
4 years ago
Mark Felder
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
4 years ago
Ivan Tashkinov
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
4 years ago
Haelwenn (lanodan) Monnier
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
4 years ago
Egor Kislitsyn
1f35acce54
Merge OGP parser with TwitterCard
4 years ago
Ivan Tashkinov
b28cec4271
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
4 years ago
lain
5d87405b51
ActivityPubTest: Update test for atomized parameters.
4 years ago
Thibaut Girka
570123ae21
Add test
4 years ago
rinpatch
7aa6c82937
Merge branch 'remake-remodel-dms' into 'develop'
...
Chats / ChatMessages
See merge request pleroma/pleroma!2429
4 years ago
lain
600e2ea073
ActivityPubTest: Make test easier to understand.
4 years ago
lain
9e411372d0
ActivityPub: Don't show announces of your own objects in timeline.
4 years ago
Egor Kislitsyn
3dd1de61a7
Add `url` field to AdminAPI.AccountView
4 years ago
lain
063e6b9841
StatusController: Correctly paginate favorites.
...
Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this.
4 years ago
lain
064c4f86f3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
e1bc37d118
MigrationHelper: Move notification backfilling to own module.
4 years ago
Egor Kislitsyn
d44843e677
Restrict ActivityExpirationPolicy to Notes only
4 years ago
Egor Kislitsyn
da22119c2f
Merge branch 'develop' into global-status-expiration
4 years ago
lain
d192492658
Merge branch 'openapi/admin/relay' into 'develop'
...
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
4 years ago
lain
c450b248cc
Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
...
Delete outgoing pending follow requests on user deletion
See merge request pleroma/pleroma!2631
4 years ago
lain
3b5282bef2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
89b85f6529
ChatController: Remove nonsensical pagination.
4 years ago
lain
7d66dd180a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
fe2a5d0614
ChatController: Make last_read_id mandatory.
4 years ago
Sergey Suprunenko
8d9e586887
Delete pending follow requests on user deletion
4 years ago
lain
801e668a97
ChatController: Add `last_read_id` option to mark_as_read.
4 years ago
lain
2cdaac4330
SideEffects: Move streaming of chats to after the transaction.
4 years ago
lain
f4cf4ae16e
ChatController: Use new oauth scope *:chats.
4 years ago
Haelwenn (lanodan) Monnier
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
4 years ago
lain
9189b489ee
Migrations: Move Notification migration code to helper
4 years ago
lain
ca0e6e702b
ChatMessageReference -> Chat.MessageReference
4 years ago
lain
4e8c0eecd5
WebPush: Don't break on contentless chat messages.
4 years ago
Egor Kislitsyn
b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
4 years ago