aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-10-30Rip out the rest of htmlsanitizeexrinpatch
2019-10-29Remove commented-out coderinpatch
2019-10-29Fix XSS emoji testrinpatch
2019-10-29Bump fast_sanitize dependencyrinpatch
2019-10-29Bump fast_sanitize versionrinpatch
2019-10-29Add fast_sanitize to dependenciesrinpatch
2019-10-29Switch from HtmlSanitizeEx to FastSanitizerinpatch
2019-10-29Ensure myhtmlex is started before swarmrinpatch
2019-10-29Blacklist myhtmlex nodes from swarmrinpatch
2019-10-29Use the default scrubber before mediaproxy transformationrinpatch
2019-10-26Merge branch 'conversation-read-status-for-blocking-user' into 'develop'kaniini
2019-10-26Mark the conversations with the blocked user as read and update the blocking ...eugenijm
2019-10-25Merge branch 'remove-unsed-info-fields-fn' into 'develop'rinpatch
2019-10-25Remove unused Pleroma.User.info_fields/0Egor Kislitsyn
2019-10-25Merge branch 'fix/pleroma-ctl-fix-shift-dash' into 'develop'kaniini
2019-10-25Merge branch 'object-fetch-errors' into 'develop'kaniini
2019-10-24pleroma_ctl: fix crashes due to different shift(1) behavior on dashrinpatch
2019-10-24fix teststwf
2019-10-24object fetcher error handlingstwf
2019-10-24Merge branch 'fix/readme' into 'develop'kaniini
2019-10-24fix link on docs-develop.pleroma.socialMaksim Pechnikov
2019-10-23Merge branch '1304-user-info-deprecation' into 'develop'feld
2019-10-23[#1304] Extra bullet-proofing.Ivan Tashkinov
2019-10-23[#1304] Adjusted User.Info references from Notification.Ivan Tashkinov
2019-10-23Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-d...Ivan Tashkinov
2019-10-23[#1304] Fixed null::jsonb handling in User.Info migration.Ivan Tashkinov
2019-10-23Merge branch 'bugfix/announce-with-bare-to-cc' into 'develop'kaniini
2019-10-22activitypub: visibility: refactor is_public?() to use JSON-LD safe accessorsAriadne Conill
2019-10-23Merge branch 'chore/add-single-value-deserialization-tests' into 'develop'kaniini
2019-10-22tests: transmogrifier: add explicit regression tests for JSON-LD string to si...Ariadne Conill
2019-10-21Merge branch 'feature/push-subject-for-dm' into 'develop'kaniini
2019-10-21SpellingMark Felder
2019-10-21Add tests for the subject of push notificationsMark Felder
2019-10-21Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'rinpatch
2019-10-21Do not include notifications from blocked users when with_muted is setrinpatch
2019-10-21Merge branch 'feature/masto_api_markers' into 'develop'kaniini
2019-10-21[#1304] Merged `develop`, handled User.Info.invisible.Ivan Tashkinov
2019-10-21update changelogMaksim Pechnikov
2019-10-21Merge branch 'develop' into feature/masto_api_markersMaksim Pechnikov
2019-10-21Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-d...Ivan Tashkinov
2019-10-21Merge branch 'feature/activitypub-semantics' into 'develop'kaniini
2019-10-21[#1304] Typo fix.Ivan Tashkinov
2019-10-20[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:plero...Ivan Tashkinov
2019-10-20Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-d...Ivan Tashkinov
2019-10-20Merge branch 'chore/add-missing-websub-drop-migration' into 'develop'kaniini
2019-10-20[#1304] Analysis issue fix.Ivan Tashkinov
2019-10-20[#1304] Moved remaining fields from User.Info to User.Ivan Tashkinov
2019-10-20add missing migration to drop websub tableAriadne Conill
2019-10-19change Maksim's test descriptionAriadne Conill
2019-10-19tests: add test to ensure invisible actors are rendered with the invisible hi...Ariadne Conill