Commit Graph

393 Commits (4a181982c34c774c9ed4b76ce1d95f6c33fce9d5)

Author SHA1 Message Date
Alex Gleason c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
3 years ago
Alex Gleason 10dfe81479
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
3 years ago
Alex Gleason 52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
3 years ago
Alex Gleason 6727a3659f
Remove Pleroma.Formatter.minify/2
3 years ago
rinpatch d3660b24d3 Copy emoji in the subject from parent post
4 years ago
rinpatch f930e83fa2 Merge branch 'fix/remove_auto_nsfw' into 'develop'
4 years ago
Mark Felder b1e1db82bc Store application details in the object under the generator key, not application key
4 years ago
Haelwenn (lanodan) Monnier 3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
4 years ago
Mark Felder 3dc7e89c54 Ensure we capture the application details into the object
4 years ago
Haelwenn (lanodan) Monnier c4439c630f
Bump Copyright to 2021
4 years ago
lain e1e7e4d379 Object: Rework how Object.normalize works
4 years ago
Haelwenn 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'"
4 years ago
Haelwenn (lanodan) Monnier acb03d591b
Insert text representation of hashtags into object["hashtags"]
4 years ago
Alex Gleason f8c93246d6 Refactor Earmark code, fix tests
4 years ago
Alex Gleason e9e17e5df3 Upgrade Earmark to v1.4.10
4 years ago
Egor Kislitsyn af3f00292c
Fix formatting
4 years ago
Egor Kislitsyn 0118ccb53c
Add `local` visibility
4 years ago
minibikini 1bfd8528bb Merge branch 'develop' into 'feature/local-only-scope'
4 years ago
Egor Kislitsyn 2a475622ee
Add Pleroma.Constants.as_local_public/0
4 years ago
Egor Kislitsyn 4f79bbbc31
Add local-only statuses
4 years ago
Mark Felder 64553ebae2 Merge branch 'develop' into chore/elixir-1.11
4 years ago
Alexander Strizhakov 9f4fe5485b
alias alphabetically order
4 years ago
Alexander Strizhakov c497558d43
AuthenticationPlug module name
4 years ago
Alexander Strizhakov 0374df1d12
other files consistency
4 years ago
Mark Felder 636c00037d Fix duplicate @doc entries
4 years ago
Haelwenn (lanodan) Monnier 7bf269fe83 Fix MRF reject for ChatMessage
4 years ago
Alex Gleason 9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
4 years ago
Alex Gleason f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
4 years ago
Alexander Strizhakov 9bf1065a06 schedule activity expiration in Oban
4 years ago
lain d91c4feebe Notification: Small refactor.
4 years ago
Maksim Pechnikov f0fefc4f5c marks notifications as read after mute
4 years ago
Sergey Suprunenko 25c69e271a
Make notifications about new statuses from muted threads read
4 years ago
lain 2e347e8286 ActivityPub: Remove `reject`, move everything to the Pipeline.
4 years ago
lain 25bfee0d12 ActivityPub: Remove ActivityPub.accept
4 years ago
Haelwenn (lanodan) Monnier 82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
4 years ago
Haelwenn (lanodan) Monnier 4644a8bd10
Fix multiple-choice poll detection
4 years ago
Mark Felder d23804f191 Use the Pleroma.Config alias
4 years ago
lain 9dda8b5427 CommonAPI: Switch to pipeline for following.
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
Haelwenn (lanodan) Monnier 27c33f216a
activity_draft: Add source field
4 years ago
lain 8cfb58a8c0 AccountController: Extract blocking to CommonAPI.
4 years ago
lain e557265a03 Merge branch 'global-status-expiration' into 'develop'
4 years ago
lain 805ab86933 Notifications: Make notifications save their type.
4 years ago
lain af9090238e CommonAPI: Newlines -> br for chat messages.
4 years ago
Egor Kislitsyn a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
4 years ago
lain 8bdf18d7c1 CommonAPI: Linkify chat messages.
4 years ago
lain dbd07d29a3 Streamer: Don't crash on streaming chat notifications
4 years ago
lain ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch 7bc2ec0aa2 Merge branch 'mastodon-migration-compat' into 'develop'
4 years ago
Roman Chvanikov 5d60b25e69 Apply suggestion to lib/pleroma/web/common_api/utils.ex
4 years ago