c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
2021-06-01 11:33:11 -05:00
10dfe81479
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
...
Move as_local_public/0 to stop making modules depend on Web at compile-time
2021-05-31 13:39:15 -05:00
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
2021-04-30 13:17:03 -05:00
6727a3659f
Remove Pleroma.Formatter.minify/2
2021-04-30 12:27:06 -05:00
d3660b24d3
Copy emoji in the subject from parent post
...
Sometimes people put emoji in the subject, which results in the subject
looking broken if someone replies to it from a server that does not
have the said emoji under the same shortcode. This patch solves the problem
by extending the emoji set available in the summary to that of the parent
post.
2021-03-22 21:20:47 +03:00
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
2021-03-19 08:48:22 +00:00
b1e1db82bc
Store application details in the object under the generator key, not application key
2021-03-01 11:29:10 -06:00
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
2021-02-27 21:26:17 +01:00
3dc7e89c54
Ensure we capture the application details into the object
2021-02-09 18:07:15 -06:00
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
2021-01-13 07:49:50 +01:00
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
2021-01-04 13:38:31 +01:00
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
2020-12-28 12:02:16 +00:00
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-22 05:15:34 +01:00
f8c93246d6
Refactor Earmark code, fix tests
2020-12-11 17:22:42 -06:00
e9e17e5df3
Upgrade Earmark to v1.4.10
2020-12-11 17:22:17 -06:00
af3f00292c
Fix formatting
2020-11-11 19:12:46 +04:00
0118ccb53c
Add `local` visibility
2020-11-11 18:54:01 +04:00
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 18:59:19 +00:00
2a475622ee
Add Pleroma.Constants.as_local_public/0
2020-10-15 19:07:00 +04:00
4f79bbbc31
Add local-only statuses
2020-10-15 18:37:44 +04:00
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
2020-10-13 09:54:53 -05:00
9f4fe5485b
alias alphabetically order
2020-10-13 16:43:59 +03:00
c497558d43
AuthenticationPlug module name
2020-10-13 16:43:58 +03:00
0374df1d12
other files consistency
2020-10-13 16:38:19 +03:00
636c00037d
Fix duplicate @doc entries
2020-10-07 09:58:45 -05:00
7bf269fe83
Fix MRF reject for ChatMessage
2020-09-17 22:07:54 +03:00
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
2020-09-11 14:13:38 -05:00
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
2020-09-11 14:09:50 -05:00
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
d91c4feebe
Notification: Small refactor.
2020-08-31 11:02:54 +02:00
f0fefc4f5c
marks notifications as read after mute
2020-08-28 18:17:44 +03:00
25c69e271a
Make notifications about new statuses from muted threads read
2020-08-17 00:11:33 +02:00
2e347e8286
ActivityPub: Remove `reject`, move everything to the Pipeline.
2020-08-12 15:07:46 +02:00
25bfee0d12
ActivityPub: Remove ActivityPub.accept
...
Switch to the pipeline in CommonAPI and SideEffects
2020-08-11 17:43:16 +02:00
82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
2020-07-15 11:40:23 +02:00
4644a8bd10
Fix multiple-choice poll detection
2020-07-15 11:39:55 +02:00
d23804f191
Use the Pleroma.Config alias
2020-07-09 10:53:51 -05:00
9dda8b5427
CommonAPI: Switch to pipeline for following.
2020-07-08 15:40:56 +02:00
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
27c33f216a
activity_draft: Add source field
2020-06-26 05:48:25 +02:00
8cfb58a8c0
AccountController: Extract blocking to CommonAPI.
2020-06-25 11:44:04 +02:00
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
805ab86933
Notifications: Make notifications save their type.
2020-06-02 13:24:34 +02:00
af9090238e
CommonAPI: Newlines -> br for chat messages.
2020-06-01 15:14:22 +02:00
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
8bdf18d7c1
CommonAPI: Linkify chat messages.
2020-05-30 12:30:31 +02:00
dbd07d29a3
Streamer: Don't crash on streaming chat notifications
2020-05-25 17:27:45 +02:00
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-25 13:57:27 +02:00
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
5d60b25e69
Apply suggestion to lib/pleroma/web/common_api/utils.ex
2020-05-22 15:44:10 +00:00
Alex Gleason