aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2022-09-03Merge branch 'from/upstream-develop/tusooa/assoc-object-id' into 'develop'Haelwenn
Add function to calculate associated object id Closes #2307 See merge request pleroma/pleroma!3692
2022-09-03Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'Haelwenn
Editing Closes #1429, #2859, and #2288 See merge request pleroma/pleroma!3678
2022-09-03Merge branch 'from/develop/tusooa/2807-remote-xact-post' into 'develop'Haelwenn
Remote interaction with posts Closes #2807 and #978 See merge request pleroma/pleroma!3587
2022-08-24OAuthPlug: use user cache instead of joiningHélène
As this plug is called on every request, this should reduce load on the database by not requiring to select on the users table every single time, and to instead use the by-ID user cache whenever possible.
2022-08-20Expose availability of GET /main/ostatus via instanceTusooa Zhu
2022-08-20Make remote interaction page translatableTusooa Zhu
2022-08-20Display status link in remote interaction formTusooa Zhu
2022-08-20LintTusooa Zhu
2022-08-20Add GET endpoints for remote subscription formsTusooa Zhu
There are two reasons for adding a GET endpoint: 0: Barely displaying the form does not change anything on the server. 1: It makes frontend development easier as they can now use a link, instead of a form, to allow remote users to interact with local ones.
2022-08-20Fix form item name in status_interact.htmlTusooa Zhu
2022-08-20Add remote interaction ui for postsTusooa Zhu
2022-08-20Switch to associated_object_id indexTusooa Zhu
2022-08-12Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'Haelwenn
Synchronized settings for apps (frontends) See merge request pleroma/pleroma!3698
2022-08-10Fix Varnish 7 support by ensuring Media Preview Proxy fetches headers with a ↵Mark Felder
capitalized HEAD verb
2022-08-02Use actor_types() to determine whether the Update is for userTusooa Zhu
2022-08-02Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop'Haelwenn
local only fixes Closes #2871 See merge request pleroma/pleroma!3660
2022-07-31Merge branch 'develop' into 'from/develop/tusooa/emit-move'tusooa
# Conflicts: # CHANGELOG.md # test/pleroma/user_test.exs
2022-07-31Use `duration` param for mute expiration durationmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-28Merge branch 'fix/proper-emoji-qualification' into 'develop'Haelwenn
Emoji: implement full-qualifier using combinations See merge request pleroma/pleroma!3709
2022-07-28Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'Haelwenn
Make mutes and blocks behave the same as other lists Closes #2384 See merge request pleroma/pleroma!3693
2022-07-25EmojiReactValidator: use new qualification methodHélène
2022-07-24EmojiReactValidator: fix emoji qualificationHélène
Tries fully-qualifying emoji when receiving them, by adding the emoji variation sequence to the received reaction emoji. This issue arises when other instance software, such as Misskey, tries reacting with emoji that have unqualified or minimally qualified variants, like a red heart. Pleroma only accepts fully qualified emoji in emoji reactions, and refused those emoji. Now, Pleroma will attempt to properly qualify them first, and reject them if checks still fail. This commit contains changes to tests proposed by lanodan. Co-authored-by: Haelwenn <contact+git.pleroma.social@hacktivis.me>
2022-07-24Make AntiLinkSpamPolicy history-awareTusooa Zhu
2022-07-24Make HashtagPolicy history-awareTusooa Zhu
2022-07-23Make NoEmptyPolicy work with UpdateTusooa Zhu
2022-07-23Make NormalizeMarkup history-awareTusooa Zhu
2022-07-23Make NoPlaceholderTextPolicy history-awareTusooa Zhu
2022-07-23Make MediaProxyWarmingPolicy history-awareTusooa Zhu
2022-07-23Make ForceMentionsInContent history-awareTusooa Zhu
2022-07-23Make EnsureRePrepended history-awareTusooa Zhu
2022-07-23Make MRF Keyword history-awareTusooa Zhu
2022-07-23Merge branch 'mute-expiration' into 'develop'tusooa
MastoAPI: Show mutes expiration date See merge request pleroma/pleroma!3682
2022-07-22Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'"Haelwenn
This reverts merge request !3684
2022-07-22AttachmentValidator: fix_media_type/1 fallback to application/octet-streamHaelwenn (lanodan) Monnier
2022-07-22ArticleNotePageValidator: Fix when attachments are a Map (ie. owncast)Haelwenn (lanodan) Monnier
2022-07-21Merge branch 'birthday_fix' into 'develop'tusooa
Allow to unset birthday See merge request pleroma/pleroma!3702
2022-07-21Merge branch 'fix/emoji-react-qualification' into 'develop'Haelwenn
EmojiReactValidator: fix emoji qualification See merge request pleroma/pleroma!3684
2022-07-21Merge remote-tracking branch 'upstream/develop' into HEADTusooa Zhu
2022-07-20Merge branch 'resolve/notice-compatibility-routes-nginx' into 'develop'Haelwenn
Document way to do notice compatibility routes with Nginx reverse-proxy, fixes #2900 Closes #2900 See merge request pleroma/pleroma!3701
2022-07-17Allow to unset birthdaymarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-17Merge branch 'from/upstream-develop/tusooa/config-translatable' into 'develop'Haelwenn
Translatable config descriptions Closes pleroma-meta#65 See merge request pleroma/pleroma!3695
2022-07-16Document way to do notice compatibility routes with Nginx reverse-proxy insteadSean King
2022-07-17Merge branch 'notification_types' into 'develop'tusooa
MastoAPI: Use `types` for filtering notifications See merge request pleroma/pleroma!3648
2022-07-16Implement settings apiTusooa Zhu
2022-07-14Pass in msgctxt for config translation stringsTusooa Zhu
2022-07-13Make admin api use translated config descriptionsTusooa Zhu
2022-07-13Merge branch 'short-description' into 'develop'tusooa
Add short_description instance field Closes #2865 See merge request pleroma/pleroma!3651
2022-07-12Make mutes and blocks behave the same as other listsTusooa Zhu
2022-07-10Merge branch 'from/upstream-develop/tusooa/2830-remote-fo-mp' into 'develop'Haelwenn
Pass remote follow avatar into media proxy Closes #2830 See merge request pleroma/pleroma!3690
2022-07-10Pass remote follow avatar into media proxyTusooa Zhu