rinpatch
|
c75ba63bef
|
Merge branch '1865-media-only' into 'develop'
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes #1865
See merge request pleroma/pleroma!2650
|
4 years ago |
|
rinpatch
|
282f492cd5
|
Merge branch '1883-mrf-chat' into 'develop'
HellthreadPolicy: Restrict to Notes and Articles.
Closes #1883
See merge request pleroma/pleroma!2666
|
4 years ago |
|
lain
|
93ae1c8bd3
|
Merge branch 'feature/1854-emoji-pagination' into 'develop'
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
|
4 years ago |
|
lain
|
35e9282ffd
|
HellthreadPolicy: Restrict to Notes and Articles.
|
4 years ago |
|
lain
|
31761340fe
|
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
Support 'bot' field in account update_credentials
Closes #1600 and #1467
See merge request pleroma/pleroma!2662
|
4 years ago |
|
lain
|
7d542450b1
|
Merge branch 'develop' into '1865-media-only'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Alexander Strizhakov
|
1a704e1f1e
|
fix for packs pagination
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
3d4cfc9c5f
|
Stop filling conversation field on incoming objects (legacy, unused)
conversation field is still set for outgoing federation for compatibility.
|
4 years ago |
|
feld
|
f928267773
|
Merge branch 'issue/1855' into 'develop'
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
|
4 years ago |
|
Sergey Suprunenko
|
b63646169d
|
Add support for bot field in update_credentials
|
4 years ago |
|
Ivan Tashkinov
|
5237a2df9f
|
[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
|
4 years ago |
|
Alexander Strizhakov
|
3e3f9253e6
|
adding overall count for packs and files
|
4 years ago |
|
Alexander Strizhakov
|
4975ed86bc
|
emoji pagination for pack show action
|
4 years ago |
|
Alexander Strizhakov
|
3becdafd33
|
emoji packs pagination
|
4 years ago |
|
Maksim Pechnikov
|
4044f24e2e
|
fix test
|
4 years ago |
|
Mark Felder
|
2731ea1334
|
Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
|
4 years ago |
|
Mark Felder
|
3462d4b995
|
Merge branch 'develop' into issue/1855
|
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 |
|
Maksim
|
96493da7bd
|
Apply suggestion to test/web/media_proxy/invalidation_test.exs
|
4 years ago |
|
Maksim
|
078d687e6e
|
Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
|
4 years ago |
|
Maksim
|
2991aae4c4
|
Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
|
4 years ago |
|
Maksim
|
11b22a4229
|
Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
|
4 years ago |
|
Maksim
|
6d33a3a51b
|
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
|
4 years ago |
|
Maksim
|
793a53f1ec
|
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
|
4 years ago |
|
Maksim
|
1b45bc7b2a
|
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
|
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
|
1eb6cedaad
|
ActivityPub: When restricting to media posts, only show 'Creates'.
|
4 years ago |
|
Maksim Pechnikov
|
579763126f
|
Merge branch 'develop' into issue/1855
|
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 |
|
Maksim Pechnikov
|
62b8c31b7a
|
added tests
|
4 years ago |
|
lain
|
b7df7436c8
|
Conversations: Return last dm for conversation, not last message.
|
4 years ago |
|
Maksim Pechnikov
|
2e8a236cef
|
fix invalidates media url's
|
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 |
|
Maksim Pechnikov
|
f9dcf15ecb
|
added admin api for MediaProxy cache invalidation
|
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 |
