aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Expand)Author
2022-09-03Merge branch 'from/upstream-develop/tusooa/assoc-object-id' into 'develop'Haelwenn
2022-09-03Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'Haelwenn
2022-09-03Merge branch 'from/develop/tusooa/2807-remote-xact-post' into 'develop'Haelwenn
2022-08-27Merge branch 'feature/emoji-15-support' into 'develop'tusooa
2022-08-24Merge branch 'fix_flaky_test_user_relationship_test.exs_81' into 'develop'tusooa
2022-08-24fix flaky test_user_relationship_test.exs:81Ilja
2022-08-24OAuthPlug: use user cache instead of joiningHélène
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
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-20emoji-test: update to latest 15.0 draftHélène
2022-08-12Merge branch 'from/upstream-develop/tusooa/2912-receiver-reject-mrf' into 'de...Haelwenn
2022-08-12Merge branch 'fix_flaky_tests_where_we_sometimes_loose_db_connections' into '...Haelwenn
2022-08-12Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'Haelwenn
2022-08-12Merge branch 'from/upstream-develop/floatingghost/follow-state' into 'develop'Haelwenn
2022-08-10Fix Varnish 7 support by ensuring Media Preview Proxy fetches headers with a ...Mark Felder
2022-08-08Treat containment failure as cancel in ReceiverWorkerTusooa Zhu
2022-08-06Treat MRF rejects as success in Oban workerTusooa Zhu
2022-08-03bugfix/follow-state (#104)floatingghost
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
2022-08-02Merge branch 'from/upstream-develop/tusooa/backup-without-email' into 'develop'Haelwenn
2022-07-31Merge branch 'develop' into 'from/develop/tusooa/emit-move'tusooa
2022-07-31Use `duration` param for mute expiration durationmarcin mikołajczak
2022-07-28Merge branch 'fix/proper-emoji-qualification' into 'develop'Haelwenn
2022-07-28Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'Haelwenn
2022-07-27Emoji: apply recommended tail call changesHélène
2022-07-26Emoji: split qualification variation into a moduleHélène
2022-07-25EmojiReactValidator: use new qualification methodHélène
2022-07-25Emoji: implement full-qualifier using combinationsHélène
2022-07-24EmojiReactValidator: fix emoji qualificationHélène
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
2022-07-22Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'"Haelwenn
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