lain
|
74b88c0a8b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
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
|
3250228be9
|
AccountView: Add 'accepts_chat_messages' to view.
|
4 years ago |
|
Mark Felder
|
d44ec2bf4c
|
Remove camelCase from the keys
|
4 years ago |
|
Mark Felder
|
5a8e0208b1
|
Add fields limits to instance metadata, add tests
|
4 years ago |
|
Mark Felder
|
0883a706dc
|
Merge branch 'develop' into activation-meta
|
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 |
|
Haelwenn (lanodan) Monnier
|
244655e884
|
MastoAPI: Show source field when deleting
|
4 years ago |
|
lain
|
8cfb58a8c0
|
AccountController: Extract blocking to CommonAPI.
|
4 years ago |
|
lain
|
35f6770436
|
StatusView: Add pleroma.parent_visible
|
4 years ago |
|
lain
|
98af7b59e4
|
Merge branch 'update-validator' into 'develop'
Update validator
See merge request pleroma/pleroma!2668
|
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 |
|
lain
|
2c603f2009
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
|
4 years ago |
|
Mark Felder
|
df5e048cbb
|
Do not need a function to provide fallback value with default defined in config.exs
|
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
|
b05f795326
|
Credo fixes
|
4 years ago |
|
lain
|
e785cd5cae
|
ActivityPub: Remove `update` and switch to pipeline.
|
4 years ago |
|
Sergey Suprunenko
|
ac0344dd24
|
Only accounts with Service actor_type are considered as bots
|
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 |
|
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
|
ed189568f3
|
moving mrf settings from instance to separate group
|
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 |
|
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 |
|
Ivan Tashkinov
|
2188097066
|
[#1794] Fixes URI query handling for hashtags extraction in search.
|
4 years ago |
|
Ivan Tashkinov
|
b28cec4271
|
[#1794] Fixes URI query handling for hashtags extraction in search.
|
4 years ago |
|
lain
|
9e411372d0
|
ActivityPub: Don't show announces of your own objects in timeline.
|
4 years ago |
|
lain
|
3b5282bef2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
7d66dd180a
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
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 |
|
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 |
|
Haelwenn
|
d74985af23
|
Merge branch 'features/apc2s-pagination' into 'develop'
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
|
4 years ago |
|
Haelwenn
|
54bae06b4f
|
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
Unifies all the similar functions to one and simplify some blocks with it.
|
4 years ago |
|
Egor Kislitsyn
|
317e2b8d61
|
Use atoms as keys in `ActivityPub.fetch_*` functions options
|
4 years ago |
|
lain
|
f3ccd50a33
|
ChatMessageReferences: Adjust views
|
4 years ago |
|
feld
|
6c1c2cddec
|
Merge branch 'fix/1794-hashtag-search-results' into 'develop'
[#1794] Improvements to hashtags extraction from search query
Closes #1794
See merge request pleroma/pleroma!2611
|
4 years ago |
|
lain
|
37542a9dfa
|
Activity: Remove notifications-related functions.
|
4 years ago |
|
lain
|
127ccc4e1c
|
NotificationController: Don't return chat_mentions by default.
|
4 years ago |
|
lain
|
805ab86933
|
Notifications: Make notifications save their type.
|
4 years ago |
|
lain
|
8e1db6a835
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
rinpatch
|
6fb900a496
|
Merge branch 'user-updates' into 'develop'
AccountController: Federate user account changes.
Closes pleroma-support#33 and #1801
See merge request pleroma/pleroma!2617
|
4 years ago |
