minibikini
|
1bfd8528bb
|
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
|
2020-10-27 18:59:19 +00:00 |
|
Egor Kislitsyn
|
2a475622ee
|
Add Pleroma.Constants.as_local_public/0
|
2020-10-15 19:07:00 +04:00 |
|
Egor Kislitsyn
|
4f79bbbc31
|
Add local-only statuses
|
2020-10-15 18:37:44 +04:00 |
|
Mark Felder
|
64553ebae2
|
Merge branch 'develop' into chore/elixir-1.11
|
2020-10-13 09:54:53 -05:00 |
|
Alexander Strizhakov
|
9f4fe5485b
|
alias alphabetically order
|
2020-10-13 16:43:59 +03:00 |
|
Alexander Strizhakov
|
c497558d43
|
AuthenticationPlug module name
|
2020-10-13 16:43:58 +03:00 |
|
Alexander Strizhakov
|
0374df1d12
|
other files consistency
|
2020-10-13 16:38:19 +03:00 |
|
Mark Felder
|
636c00037d
|
Fix duplicate @doc entries
|
2020-10-07 09:58:45 -05:00 |
|
Haelwenn (lanodan) Monnier
|
7bf269fe83
|
Fix MRF reject for ChatMessage
|
2020-09-17 22:07:54 +03:00 |
|
Alex Gleason
|
9733c9d065
|
Merge remote-tracking branch 'upstream/develop' into chat-moderation
|
2020-09-11 14:13:38 -05:00 |
|
Alex Gleason
|
f88dc1937e
|
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
|
2020-09-11 14:09:50 -05:00 |
|
Alexander Strizhakov
|
9bf1065a06
|
schedule activity expiration in Oban
|
2020-09-10 21:50:40 +03:00 |
|
lain
|
d91c4feebe
|
Notification: Small refactor.
|
2020-08-31 11:02:54 +02:00 |
|
Maksim Pechnikov
|
f0fefc4f5c
|
marks notifications as read after mute
|
2020-08-28 18:17:44 +03:00 |
|
Sergey Suprunenko
|
25c69e271a
|
Make notifications about new statuses from muted threads read
|
2020-08-17 00:11:33 +02:00 |
|
lain
|
2e347e8286
|
ActivityPub: Remove `reject`, move everything to the Pipeline.
|
2020-08-12 15:07:46 +02:00 |
|
lain
|
25bfee0d12
|
ActivityPub: Remove ActivityPub.accept
Switch to the pipeline in CommonAPI and SideEffects
|
2020-08-11 17:43:16 +02:00 |
|
Haelwenn (lanodan) Monnier
|
82895a4012
|
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
|
2020-07-15 11:40:23 +02:00 |
|
Haelwenn (lanodan) Monnier
|
4644a8bd10
|
Fix multiple-choice poll detection
|
2020-07-15 11:39:55 +02:00 |
|
Mark Felder
|
d23804f191
|
Use the Pleroma.Config alias
|
2020-07-09 10:53:51 -05:00 |
|
lain
|
9dda8b5427
|
CommonAPI: Switch to pipeline for following.
|
2020-07-08 15:40:56 +02:00 |
|
lain
|
d3efb50262
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
|
2020-07-03 16:44:31 +02:00 |
|
Haelwenn (lanodan) Monnier
|
27c33f216a
|
activity_draft: Add source field
|
2020-06-26 05:48:25 +02:00 |
|
lain
|
8cfb58a8c0
|
AccountController: Extract blocking to CommonAPI.
|
2020-06-25 11:44:04 +02: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 |
|
lain
|
805ab86933
|
Notifications: Make notifications save their type.
|
2020-06-02 13:24:34 +02:00 |
|
lain
|
af9090238e
|
CommonAPI: Newlines -> br for chat messages.
|
2020-06-01 15:14:22 +02:00 |
|
Egor Kislitsyn
|
a7627bdc7a
|
Merge remote-tracking branch 'origin/develop' into global-status-expiration
|
2020-06-01 15:48:51 +04:00 |
|
lain
|
8bdf18d7c1
|
CommonAPI: Linkify chat messages.
|
2020-05-30 12:30:31 +02:00 |
|
lain
|
dbd07d29a3
|
Streamer: Don't crash on streaming chat notifications
|
2020-05-25 17:27:45 +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 |
|
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 |
|
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
|
355aa3bdc7
|
ActivityPubController: Add Mastodon activity compat route.
|
2020-05-22 17:06:12 +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 |
|
lain
|
814c3e5171
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:00:05 +02:00 |
|
lain
|
e42bc5f557
|
Announcements: Handle through common pipeline.
|
2020-05-20 15:44:37 +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 |
|
Egor Kislitsyn
|
524d04d921
|
Add OpenAPI spec for PleromaAPI.ScrobbleController
|
2020-05-19 16:26:06 +04:00 |
|
lain
|
9c17109765
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-17 12:14:49 +02:00 |
|
lain
|
2dcb26a6e5
|
CommonAPI: Unblock a user even if we don't have an activity.
|
2020-05-16 12:28:24 +02:00 |
|
lain
|
0f0acc740d
|
Chat: Allow posting without content if an attachment is present.
|
2020-05-13 15:31:28 +02:00 |
|
lain
|
3cff4e24cd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-13 12:44:16 +02:00 |
|
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
2020-05-13 00:25:21 +04:00 |
|
lain
|
f28ed36b4d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-11 17:14:58 +02:00 |
|
lain
|
5367a00257
|
Deletion: Handle the case of pruned objects.
|
2020-05-11 15:06:23 +02:00 |
|
lain
|
7637ef4203
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-08 13:13:37 +02:00 |
|
lain
|
ef55d24054
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
2020-05-07 18:53:34 +02:00 |
|
lain
|
fb2d284d28
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-07 15:05:40 +02:00 |