lain
|
3898dd69a6
|
SideEffects: Ensure a chat is present before streaming something out.
|
2020-05-29 16:05:02 +02:00 |
lain
|
767ce8b803
|
StreamerView: Actually send Chats, not ChatMessages.
|
2020-05-29 16:02:45 +02:00 |
lain
|
863c02b25d
|
SideEffects: Stream out chat messages.
|
2020-05-29 15:44:03 +02:00 |
lain
|
c86a88edec
|
Streamer: Add a chat message stream.
|
2020-05-29 15:24:41 +02:00 |
lain
|
af6d01ec93
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-29 12:36:17 +02:00 |
rinpatch
|
396bc69aee
|
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
Fix profile emojis bypassing mediaproxy and harden CSP
Closes #1810
See merge request pleroma/pleroma!2596
|
2020-05-29 09:46:31 +00:00 |
lain
|
f6ddf0cc50
|
Merge branch 'feature/1792-update-actor-type' into 'develop'
Validate actor type
See merge request pleroma/pleroma!2593
|
2020-05-28 16:58:28 +00:00 |
Mark Felder
|
95f6240889
|
Fix minor spelling error
|
2020-05-27 14:34:37 -05:00 |
rinpatch
|
8f6d428880
|
AccountView: Use mediaproxy URLs for emojis
Also use atom keys in emoji maps instead of binaries
Closes #1810
|
2020-05-27 19:44:02 +03:00 |
rinpatch
|
d35be02e70
|
Merge branch 'refactor-add-mention-step-one' into 'develop'
Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580
|
2020-05-27 14:17:12 +00:00 |
Alexander Strizhakov
|
047a11c48f
|
Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
|
2020-05-27 10:55:42 +00:00 |
lain
|
b9e2678b9e
|
Merge branch 'fav-speedup' into 'develop'
ActivityPub: Change ordering to `nulls last` in favorites query
See merge request pleroma/pleroma!2594
|
2020-05-27 08:02:00 +00:00 |
lain
|
7e13200869
|
ActivityPub: Change ordering to `nulls last` in favorites query
This makes it use our existing index and speeds up the query.
|
2020-05-27 09:46:12 +02:00 |
Alexander Strizhakov
|
3249141588
|
validate actor type
|
2020-05-27 10:14:22 +03:00 |
lain
|
51bc6674f6
|
Mastodon API Controllers: Use the correct params for rate limiting.
|
2020-05-26 13:45:54 +02:00 |
Ivan Tashkinov
|
d7a57004ef
|
[#1501] Made user feed contain public and unlisted activities.
|
2020-05-25 23:27:47 +03:00 |
lain
|
dbd07d29a3
|
Streamer: Don't crash on streaming chat notifications
|
2020-05-25 17:27:45 +02:00 |
lain
|
6bd7070b00
|
Transmogrifier: Use a simpler way to get mentions.
|
2020-05-25 15:08:43 +02:00 |
lain
|
ee35bb5ac2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-25 13:57:27 +02:00 |
lain
|
ec470c4c77
|
Merge branch 'openapi/admin/status' into 'develop'
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
|
2020-05-25 11:40:54 +00:00 |
rinpatch
|
7bc2ec0aa2
|
Merge branch 'mastodon-migration-compat' into 'develop'
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
|
2020-05-24 19:05:57 +00:00 |
lain
|
ddbbefeb2e
|
Merge branch 'feature/configure-filename-truncate' into 'develop'
Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573
|
2020-05-22 16:05:35 +00:00 |
Roman Chvanikov
|
5d60b25e69
|
Apply suggestion to lib/pleroma/web/common_api/utils.ex
|
2020-05-22 15:44:10 +00:00 |
Roman Chvanikov
|
cc82229ba7
|
Add filename_display_max_length config
|
2020-05-22 18:19:25 +03:00 |
lain
|
91c8467582
|
OStatusController: Add Mastodon activity compat route.
|
2020-05-22 17:11:59 +02:00 |
lain
|
355aa3bdc7
|
ActivityPubController: Add Mastodon activity compat route.
|
2020-05-22 17:06:12 +02:00 |
lain
|
8a4bd9e5d1
|
OStatusController: Add Mastodon compatibility route for objects.
|
2020-05-22 16:47:22 +02:00 |
rinpatch
|
1fa7aa9fc5
|
Merge branch 'emoji-react-better-errors' into 'develop'
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
|
2020-05-22 14:36:08 +00:00 |
Egor Kislitsyn
|
ba106aa9c8
|
Fix notifications mark as read API
|
2020-05-22 18:15:36 +04:00 |
lain
|
ca755f9a73
|
ActivityPubController: Add Mastodon compatibility route.
|
2020-05-22 16:15:29 +02:00 |
lain
|
bcb549531f
|
EmojiReactionController: Return more appropriate error.
|
2020-05-22 14:38:28 +02:00 |
Haelwenn
|
7b02bfca51
|
Merge branch 'announce-validator' into 'develop'
Announce validator
See merge request pleroma/pleroma!2567
|
2020-05-22 05:47:53 +00:00 |
Haelwenn
|
a57e7f3503
|
Merge branch '1113-op-mentioning' into 'develop'
CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563
|
2020-05-22 05:22:07 +00:00 |
lain
|
ab1154e13f
|
Merge branch 'admin-logo-upload' into 'develop'
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
|
2020-05-21 14:30:34 +00:00 |
lain
|
578ed3a37f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:35:13 +02:00 |
lain
|
a42a0716ec
|
Merge branch 'features/emoji_stealer' into 'develop'
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
|
2020-05-21 13:31:49 +00:00 |
lain
|
f166316f50
|
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
|
2020-05-21 13:30:09 +00:00 |
Egor Kislitsyn
|
45d2c4157f
|
Add OpenAPI spec for AdminAPI.StatusController
|
2020-05-21 17:23:12 +04:00 |
lain
|
814c3e5171
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:00:05 +02:00 |
lain
|
cdc6ba8d7b
|
AnnounceValidator: Check for announcability
|
2020-05-21 13:58:18 +02:00 |
lain
|
c76267afb9
|
Credo fixes.
|
2020-05-21 13:31:52 +02:00 |
lain
|
23e248694d
|
Announcements: Fix all tests.
|
2020-05-21 13:16:21 +02:00 |
lain
|
d9d425708e
|
SideEffects: Builed out Announce effects.
|
2020-05-21 12:43:09 +02:00 |
Egor Kislitsyn
|
9de9760aa6
|
Move status actions to AdminAPI.StatusController
|
2020-05-21 13:52:30 +04:00 |
eugenijm
|
b7fc61e17b
|
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
|
2020-05-21 04:41:42 +03:00 |
lain
|
39031f4860
|
Pipeline: Don't federate if federation is disabled.
|
2020-05-20 16:36:55 +02:00 |
lain
|
e42bc5f557
|
Announcements: Handle through common pipeline.
|
2020-05-20 15:44:37 +02:00 |
lain
|
265746b21f
|
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
|
2020-05-20 12:08:28 +00:00 |
lain
|
c7cdc553ff
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
|
2020-05-20 14:02:40 +02:00 |
lain
|
eb5f428565
|
CommonAPI: Change public->private implicit addressing.
This will not add the OP to the `to` field anymore when going from
public to private.
|
2020-05-20 13:38:47 +02:00 |