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
Egor Kislitsyn
d4b5a9730e
Remove `poll` from `notification_type` OpenAPI spec
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
Alexander Strizhakov
a77b0388f4
credo fix
4 years ago
rinpatch
5c0e1039ce
Chunk the notification type backfill migration
...
Long-term we want that migration to be done entirely in SQL,
but for now this is a hotfix to not cause OOMs on large databases.
This is using a homegrown version of `Repo.stream`, it's worse in
terms of performance than the upstream since it doesn't use the same
prepared query for chunk queries, but unlike the upstream it supports
preloads.
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
32c6576b60
naming
4 years ago
Alexander Strizhakov
e1603ac8fe
fix attemps to merge map
4 years ago
Alexander Strizhakov
9a4fde9766
Mogrify args as custom tuples
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
lain
1d625c29a0
ControllerHelper: Always return id field.
4 years ago
lain
4b865bba10
Apply suggestion to lib/pleroma/web/controller_helper.ex
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
09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
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
Ivan Tashkinov
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
4 years ago
Egor Kislitsyn
2419776e19
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
4 years ago
Mark Felder
7f7a1a4676
Check for media proxy base_url, not Upload base_url
4 years ago
Mark Felder
8a59fde0e5
Merge branch 'develop' into fix/csp-mediaproxy-base-url
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
5e44e9d698
Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
rinpatch
99afc7f4e4
HTTP security plug: add media proxy base url host to csp
4 years ago
rinpatch
7aa6c82937
Merge branch 'remake-remodel-dms' into 'develop'
...
Chats / ChatMessages
See merge request pleroma/pleroma!2429
4 years ago
lain
9e411372d0
ActivityPub: Don't show announces of your own objects in timeline.
4 years ago
lain
86fec45f40
ControllerHelper: Fix wrong comparison.
4 years ago
lain
b4c50be9df
Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
lain
be7c322865
Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
lain
c4f267b3be
Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
lain
1b746cfbbb
Merge branch 'add-url-to-admin-account-view' into 'develop'
...
Add `url` field to AdminAPI.AccountView
See merge request pleroma/pleroma!2633
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
40d5058cc4
Merge branch 'remake-remodel-dms' 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
lain
fc04a138d4
Apply suggestion to lib/pleroma/notification.ex
4 years ago
Haelwenn (lanodan) Monnier
fe1cb56fdc
transmogrifier: MIME.valid?/1 for mediaType
...
No issues with the rest of the network yet but this makes sure it will work
once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429
is merged.
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