lain
|
7ed2296416
|
Nodeinfo: Add chat information back in.
|
2020-06-26 13:04:15 +02:00 |
|
lain
|
15a8b70318
|
User: Don't unfollow on block when the relevant setting is set.
|
2020-06-26 12:06:00 +02:00 |
|
lain
|
c3383d4fab
|
BlockValidator: Restore old behavior for incoming blocks.
|
2020-06-26 11:58:40 +02:00 |
|
Haelwenn (lanodan) Monnier
|
27c33f216a
|
activity_draft: Add source field
|
2020-06-26 05:48:25 +02:00 |
|
Haelwenn (lanodan) Monnier
|
d6c958b4c2
|
nodeinfo: Fix MRF transparency
|
2020-06-26 05:33:59 +02:00 |
|
feld
|
8288419686
|
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
|
2020-06-25 21:35:39 +00:00 |
|
lain
|
04abee782b
|
AntiSpamLinkPolicy: Exempt local users.
|
2020-06-25 12:40:39 +02:00 |
|
lain
|
84f9ca1956
|
Blocking: Don't federate if the options is set.
|
2020-06-25 12:03:14 +02:00 |
|
lain
|
44bb7cfccd
|
ActivityPub: Remove block .
|
2020-06-25 11:51:33 +02:00 |
|
lain
|
8cfb58a8c0
|
AccountController: Extract blocking to CommonAPI.
|
2020-06-25 11:44:04 +02:00 |
|
lain
|
e38293c8f1
|
Transmogrifier: Switch to pipeline for Blocks.
|
2020-06-25 11:33:54 +02:00 |
|
lain
|
89e5b2046b
|
ObjectValidator: Basic Block support.
|
2020-06-25 11:13:35 +02:00 |
|
lain
|
4c5fb831b3
|
Status schema: Add parent_visible.
|
2020-06-24 14:33:00 +02:00 |
|
lain
|
35f6770436
|
StatusView: Add pleroma.parent_visible
|
2020-06-24 13:29:08 +02:00 |
|
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
|
2020-06-24 10:42:07 +00:00 |
|
lain
|
98af7b59e4
|
Merge branch 'update-validator' into 'develop'
Update validator
See merge request pleroma/pleroma!2668
|
2020-06-23 18:10:33 +00:00 |
|
Roman Chvanikov
|
1471b70ef1
|
Merge develop
|
2020-06-23 20:56:55 +03:00 |
|
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
|
2020-06-23 16:38:27 +00:00 |
|
lain
|
aee815b478
|
ObjectValidator: Clarify type of object.
|
2020-06-23 12:37:05 +02:00 |
|
lain
|
2c603f2009
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
|
2020-06-23 10:17:12 +02:00 |
|
Haelwenn (lanodan) Monnier
|
c116b6d6d6
|
ActivityPubController: Update upload_media @doc
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
|
2020-06-23 04:42:44 +02:00 |
|
Haelwenn
|
d21ef5e66b
|
Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'
Add missing default config value for :instance, instance_thumbnail
See merge request pleroma/pleroma!2672
|
2020-06-23 01:55:33 +00:00 |
|
Mark Felder
|
df5e048cbb
|
Do not need a function to provide fallback value with default defined in config.exs
|
2020-06-22 17:39:02 -05:00 |
|
Haelwenn
|
98f014d3be
|
Merge branch 'warning/mastofe-settings-blob' into 'develop'
Add warning against parsing/reusing MastoFE settings blob
See merge request pleroma/pleroma!2671
|
2020-06-22 21:59:21 +00:00 |
|
Haelwenn (lanodan) Monnier
|
8f6ba4b22f
|
Add warning against parsing/reusing MastoFE settings blob
|
2020-06-22 23:45:29 +02:00 |
|
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
|
2020-06-22 15:40:09 +00:00 |
|
Egor Kislitsyn
|
b3a549e916
|
Update NotificationOperation spec
|
2020-06-22 19:18:33 +04:00 |
|
Egor Kislitsyn
|
7e6f43c0d7
|
Add is_muted to notifications
|
2020-06-22 19:03:04 +04:00 |
|
lain
|
59bdef0c33
|
Merge branch 'feature/1739-account-endpoints' into 'develop'
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
|
2020-06-22 12:37:10 +00:00 |
|
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
|
2020-06-22 12:25:12 +00:00 |
|
lain
|
b05f795326
|
Credo fixes
|
2020-06-22 14:02:29 +02:00 |
|
lain
|
e785cd5cae
|
ActivityPub: Remove update and switch to pipeline.
|
2020-06-22 13:59:45 +02:00 |
|
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
|
2020-06-22 11:34:07 +00:00 |
|
lain
|
9438f83f83
|
Transmogrifier: Handle Update with the pipeline.
|
2020-06-22 13:16:05 +02:00 |
|
lain
|
31a4d42ce0
|
SideEffects: Handle user updating.
|
2020-06-22 13:15:37 +02:00 |
|
rinpatch
|
282f492cd5
|
Merge branch '1883-mrf-chat' into 'develop'
HellthreadPolicy: Restrict to Notes and Articles.
Closes #1883
See merge request pleroma/pleroma!2666
|
2020-06-22 10:00:13 +00:00 |
|
lain
|
93ae1c8bd3
|
Merge branch 'feature/1854-emoji-pagination' into 'develop'
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
|
2020-06-22 08:41:09 +00:00 |
|
lain
|
35e9282ffd
|
HellthreadPolicy: Restrict to Notes and Articles.
|
2020-06-22 10:35:11 +02:00 |
|
Alexander Strizhakov
|
b5f13af7ba
|
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
|
2020-06-20 10:59:08 +00:00 |
|
Alexander Strizhakov
|
c5863438ba
|
proper error codes for error in adminFE
|
2020-06-20 13:53:57 +03:00 |
|
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
|
2020-06-20 09:57:12 +00:00 |
|
lain
|
0e789bc55f
|
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
|
2020-06-20 09:39:50 +00:00 |
|
lain
|
7d542450b1
|
Merge branch 'develop' into '1865-media-only'
# Conflicts:
# CHANGELOG.md
|
2020-06-20 09:33:18 +00:00 |
|
Haelwenn (lanodan) Monnier
|
3d4cfc9c5f
|
Stop filling conversation field on incoming objects (legacy, unused)
conversation field is still set for outgoing federation for compatibility.
|
2020-06-20 00:08:26 +02:00 |
|
feld
|
f928267773
|
Merge branch 'issue/1855' into 'develop'
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
|
2020-06-19 20:38:22 +00:00 |
|
Sergey Suprunenko
|
ac0344dd24
|
Only accounts with Service actor_type are considered as bots
|
2020-06-19 21:19:00 +02:00 |
|
Sergey Suprunenko
|
b63646169d
|
Add support for bot field in update_credentials
|
2020-06-19 21:18:07 +02:00 |
|
lain
|
75670a99e4
|
UpdateValidator: Only allow updates from the user themselves.
|
2020-06-19 16:38:57 +02:00 |
|
lain
|
abdb540d45
|
ObjectValidators: Add basic UpdateValidator.
|
2020-06-19 15:30:30 +02:00 |
|
Ivan Tashkinov
|
5237a2df9f
|
[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
|
2020-06-19 16:14:06 +03:00 |
|
Alexander Strizhakov
|
02ca8a363f
|
default page size for files
|
2020-06-19 14:46:38 +03:00 |
|
Alexander Strizhakov
|
3e3f9253e6
|
adding overall count for packs and files
|
2020-06-19 10:17:24 +03:00 |
|
Alexander Strizhakov
|
4975ed86bc
|
emoji pagination for pack show action
|
2020-06-18 18:50:03 +03:00 |
|
Alexander Strizhakov
|
3becdafd33
|
emoji packs pagination
|
2020-06-18 14:32:21 +03:00 |
|
Maksim Pechnikov
|
4044f24e2e
|
fix test
|
2020-06-18 05:06:28 +03:00 |
|
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
|
2020-06-17 13:13:55 -05:00 |
|
Mark Felder
|
c08c9db0c1
|
Remove misleading is_ prefix from boolean function
|
2020-06-17 13:02:01 -05:00 |
|
Mark Felder
|
71a5d9bffb
|
Empty list as default
|
2020-06-17 12:54:02 -05:00 |
|
Mark Felder
|
3462d4b995
|
Merge branch 'develop' into issue/1855
|
2020-06-17 12:50:06 -05:00 |
|
lain
|
d772361e62
|
Merge branch 'fix/1787-mogrify-args' into 'develop'
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
|
2020-06-17 15:53:24 +00:00 |
|
Egor Kislitsyn
|
d4b5a9730e
|
Remove poll from notification_type OpenAPI spec
|
2020-06-17 18:47:59 +04:00 |
|
Maksim
|
9a371bf5f6
|
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
|
2020-06-17 13:12:38 +00:00 |
|
Maksim
|
44ce97a9c9
|
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
|
2020-06-17 13:12:32 +00:00 |
|
Maksim
|
74fd761637
|
Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
|
2020-06-17 12:56:30 +00:00 |
|
rinpatch
|
4ec2fb967e
|
Merge branch 'features/users-raw_bio' into 'develop'
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
|
2020-06-17 10:34:23 +00:00 |
|
Alexander Strizhakov
|
a77b0388f4
|
credo fix
|
2020-06-17 10:31:06 +03:00 |
|
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
|
2020-06-16 18:10:00 +00:00 |
|
Alexander Strizhakov
|
ed189568f3
|
moving mrf settings from instance to separate group
|
2020-06-16 18:32:18 +03:00 |
|
Alexander Strizhakov
|
3c2cee33ad
|
moving custom ecto types in context folders
|
2020-06-16 17:50:33 +03:00 |
|
Alexander Strizhakov
|
9a4fde9766
|
Mogrify args as custom tuples
|
2020-06-16 15:53:28 +03:00 |
|
lain
|
1eb6cedaad
|
ActivityPub: When restricting to media posts, only show 'Creates'.
|
2020-06-16 13:08:27 +02:00 |
|
stwf
|
faba1a6e33
|
fix tests
|
2020-06-15 12:25:03 -04:00 |
|
Maksim Pechnikov
|
579763126f
|
Merge branch 'develop' into issue/1855
|
2020-06-15 15:24:55 +03:00 |
|
Egor Kislitsyn
|
58e4e3db8b
|
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
|
2020-06-15 16:03:40 +04:00 |
|
Maksim Pechnikov
|
62b8c31b7a
|
added tests
|
2020-06-15 14:55:00 +03:00 |
|
lain
|
b7df7436c8
|
Conversations: Return last dm for conversation, not last message.
|
2020-06-15 12:27:13 +02:00 |
|
Maksim Pechnikov
|
2e8a236cef
|
fix invalidates media url's
|
2020-06-14 21:02:57 +03:00 |
|
eugenijm
|
b15cfc3d36
|
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
|
2020-06-14 18:27:11 +03:00 |
|
rinpatch
|
271ea5068f
|
Merge branch '1851-favorites-pagination' into 'develop'
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
|
2020-06-13 17:20:43 +00:00 |
|
lain
|
1d625c29a0
|
ControllerHelper: Always return id field.
|
2020-06-13 13:12:43 +02:00 |
|
lain
|
4b865bba10
|
Apply suggestion to lib/pleroma/web/controller_helper.ex
|
2020-06-13 10:37:15 +00:00 |
|
href
|
cb7be6eef2
|
Remove use of atoms in MRF.UserAllowListPolicy
|
2020-06-13 12:08:46 +03:00 |
|
Egor Kislitsyn
|
520367d6fd
|
Fix atom leak in Rich Media Parser
|
2020-06-13 12:08:46 +03:00 |
|
Mark Felder
|
26f710b9e3
|
Merge branch 'develop' into preload-data
|
2020-06-12 16:52:52 -05:00 |
|
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
|
2020-06-12 16:57:13 +00:00 |
|
Egor Kislitsyn
|
09d31d24de
|
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
|
2020-06-12 18:39:51 +04:00 |
|
Egor Kislitsyn
|
697cf92024
|
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
|
2020-06-12 18:25:29 +04:00 |
|
lain
|
e557265a03
|
Merge branch 'global-status-expiration' into 'develop'
Global status expiration
See merge request pleroma/pleroma!2208
|
2020-06-12 14:14:09 +00:00 |
|
Maksim Pechnikov
|
f9dcf15ecb
|
added admin api for MediaProxy cache invalidation
|
2020-06-12 14:49:54 +03:00 |
|
Ivan Tashkinov
|
2188097066
|
[#1794] Fixes URI query handling for hashtags extraction in search.
|
2020-06-12 14:25:41 +03:00 |
|
Egor Kislitsyn
|
2419776e19
|
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
|
2020-06-11 23:11:46 +04:00 |
|
Egor Kislitsyn
|
1f35acce54
|
Merge OGP parser with TwitterCard
|
2020-06-11 17:57:31 +04:00 |
|
Ivan Tashkinov
|
b28cec4271
|
[#1794] Fixes URI query handling for hashtags extraction in search.
|
2020-06-11 16:05:14 +03:00 |
|
lain
|
5e44e9d698
|
Apply suggestion to lib/pleroma/web/controller_helper.ex
|
2020-06-10 18:56:46 +00:00 |
|
rinpatch
|
7aa6c82937
|
Merge branch 'remake-remodel-dms' into 'develop'
Chats / ChatMessages
See merge request pleroma/pleroma!2429
|
2020-06-10 12:05:45 +00:00 |
|
lain
|
9e411372d0
|
ActivityPub: Don't show announces of your own objects in timeline.
|
2020-06-10 12:10:09 +02:00 |
|
lain
|
86fec45f40
|
ControllerHelper: Fix wrong comparison.
|
2020-06-10 11:09:45 +02:00 |
|
lain
|
b4c50be9df
|
Apply suggestion to lib/pleroma/web/controller_helper.ex
|
2020-06-10 08:12:29 +00:00 |
|
lain
|
be7c322865
|
Apply suggestion to lib/pleroma/web/controller_helper.ex
|
2020-06-10 08:02:35 +00:00 |
|
lain
|
c4f267b3be
|
Apply suggestion to lib/pleroma/web/controller_helper.ex
|
2020-06-10 08:02:26 +00:00 |
|