lain
cc8b4e48d9
InstanceView: Add chat limit, description limit
4 years ago
Alexander Strizhakov
818f3c2393
test fixes
4 years ago
Sergey Suprunenko
8277b29790
Restrict thread statuses that contain user's irreversible filters
4 years ago
Sergey Suprunenko
4a8c26654e
Restrict statuses that contain user's irreversible filters
4 years ago
lain
cf56655614
Streamer: Don't filter out announce notifications.
4 years ago
Mark Felder
4695bdd81b
Merge branch 'develop' into issue/1790-updated-oban
4 years ago
lain
c2a052a346
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
...
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
4 years ago
lain
d3efb50262
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
4 years ago
lain
945e75c8e8
SearchController: Trim query.
4 years ago
lain
e3b5559780
AccountController: Make setting accepts_chat_messages possible.
4 years ago
lain
4a7b89e372
ChatMessageValidator: Additional validation.
4 years ago
lain
5c0bf4c472
ActivityPub: Ingest information about chat acceptance.
4 years ago
lain
26a7cc3f00
UserView: Add acceptsChatMessages field
4 years ago
lain
db76c26469
AccountViewTest: Fix test.
4 years ago
lain
3250228be9
AccountView: Add 'accepts_chat_messages' to view.
4 years ago
Mark Felder
8121e46f25
Merge branch 'develop' into activation-meta
4 years ago
lain
311b7c19d0
Streamer: Align announce streaming with polling.
4 years ago
lain
61fe94d698
SideEffects: Refactor.
4 years ago
lain
691742e62d
Revert "Merge branch 'avatar-removing' into 'develop'"
...
This reverts merge request !2701
4 years ago
Mark Felder
5a8e0208b1
Add fields limits to instance metadata, add tests
4 years ago
Mark Felder
d69af7f742
Rename user.settings column
...
This is used exclusively by MastoFE/GlitchFE now
4 years ago
lain
0176b7bca2
Merge branch 'preload-fixups-2' into preloadfixups
4 years ago
lain
2382a2a151
Preload: Load the correct instance panel
4 years ago
Egor Kislitsyn
3aa04b81c4
Test default "content-type" for CastAndValidate
4 years ago
Egor Kislitsyn
4a306720e8
Merge branch 'develop' into remove-twitter-api
4 years ago
lain
651f269568
Merge branch 'avatar-removing' into 'develop'
...
UpdateCredentialsTest: Add test for removing profile images.
See merge request pleroma/pleroma!2701
4 years ago
lain
e64d08439e
UpdateCredentialsTest: Add test for removing profile images.
4 years ago
lain
8630a6c7f5
Preloaders: Use strings as keys.
4 years ago
lain
a19f8778af
User preloader: Put user info at correct key
4 years ago
lain
577da132da
Merge branch '1031-parent-visible' into 'develop'
...
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
4 years ago
Mark Felder
ce85db41a3
Lint
4 years ago
Haelwenn (lanodan) Monnier
244655e884
MastoAPI: Show source field when deleting
4 years ago
Mark Felder
69848d5c97
Rename notification "privacy_option" setting
4 years ago
Haelwenn
bf1c5e255a
Merge branch 'block-handling' into 'develop'
...
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
4 years ago
Haelwenn
09478c9cf7
Merge branch '1258-anti-link-spam-exemption' into 'develop'
...
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
4 years ago
Mark Felder
fd5e797379
Simplify notification filtering settings further
4 years ago
Mark Felder
b950fb01db
Merge branch 'develop' into refactor/notification_settings
4 years ago
lain
a5bbfa21a1
StaticFE: Prioritize json in requests.
4 years ago
lain
f378e93bf4
AccountController: Return scope in proper format.
4 years ago
lain
a2002ebb63
Preloading: Fix nodeinfo url.
4 years ago
lain
4a7a34ae8c
Preloading: Return correct data for statusnet stuff.
4 years ago
lain
7ed2296416
Nodeinfo: Add chat information back in.
4 years ago
lain
15a8b70318
User: Don't unfollow on block when the relevant setting is set.
4 years ago
lain
c3383d4fab
BlockValidator: Restore old behavior for incoming blocks.
4 years ago
Haelwenn (lanodan) Monnier
27c33f216a
activity_draft: Add source field
4 years ago
feld
8288419686
Merge branch 'preload-data' into 'develop'
...
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
4 years ago
Mark Felder
433c01b370
Merge branch 'develop' into refactor/notification_settings
4 years ago
lain
04abee782b
AntiSpamLinkPolicy: Exempt local users.
4 years ago
lain
84f9ca1956
Blocking: Don't federate if the options is set.
4 years ago
lain
44bb7cfccd
ActivityPub: Remove `block`.
4 years ago
lain
e38293c8f1
Transmogrifier: Switch to pipeline for Blocks.
4 years ago
lain
89e5b2046b
ObjectValidator: Basic `Block` support.
4 years ago
lain
d137f934df
Transmogrifier Test: Extract block handling.
4 years ago
lain
35f6770436
StatusView: Add pleroma.parent_visible
4 years ago
lain
88ccade1cb
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
...
admin api status count per instance
See merge request pleroma/pleroma!2500
4 years ago
lain
98af7b59e4
Merge branch 'update-validator' into 'develop'
...
Update validator
See merge request pleroma/pleroma!2668
4 years ago
Roman Chvanikov
1471b70ef1
Merge develop
4 years ago
Haelwenn
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
4 years ago
Maksim Pechnikov
a8d967762e
migrate to oban 2.0-rc1
4 years ago
lain
adc199c6a8
ActivityPubControllerTest: Capture error log
4 years ago
lain
d93e01137b
ActivityPubControllerTest: Testing changes.
4 years ago
lain
2737809bbf
An act of desperation.
4 years ago
lain
2c603f2009
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
lain
46f7e51b27
Merge branch 'add-muted-to-notifications' into 'develop'
...
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
4 years ago
Egor Kislitsyn
7e6f43c0d7
Add `is_muted` to notifications
4 years ago
lain
59bdef0c33
Merge branch 'feature/1739-account-endpoints' into 'develop'
...
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
4 years ago
lain
8b5bdd164e
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
...
Proper error codes for error in adminFE
Closes #1825
See merge request pleroma/pleroma!2665
4 years ago
lain
e785cd5cae
ActivityPub: Remove `update` and switch to pipeline.
4 years ago
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
lain
1e7ca24430
Update Handling Test: Fix for re-used update ids.
4 years ago
lain
31a4d42ce0
SideEffects: Handle user updating.
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
Alexander Strizhakov
c5863438ba
proper error codes for error in adminFE
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
lain
75670a99e4
UpdateValidator: Only allow updates from the user themselves.
4 years ago
lain
abdb540d45
ObjectValidators: Add basic UpdateValidator.
4 years ago
Ivan Tashkinov
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
4 years ago
lain
7e488cd4a7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
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
b66e6eb521
fixes for tests
4 years ago
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
4 years ago
Alexander Strizhakov
3c2cee33ad
moving custom ecto types in context folders
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
lain
1eb6cedaad
ActivityPub: When restricting to media posts, only show 'Creates'.
4 years ago
stwf
faba1a6e33
fix tests
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
Mark Felder
26f710b9e3
Merge branch 'develop' into preload-data
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
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
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
Roman Chvanikov
604a83ae3e
merge develop
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
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
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
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
lain
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago