summaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2020-10-28Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-28Fix warningEgor Kislitsyn
2020-10-27Merge branch 'feature/autofollowing' into 'develop'feld
autofollowing_nicknames See merge request pleroma/pleroma!3087
2020-10-27Merge branch '2236-no-name' into 'develop'Haelwenn
Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101
2020-10-27Merge branch 'develop' into 'feature/autofollowing'feld
# Conflicts: # CHANGELOG.md
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
2020-10-27phoenix_controller_render_duration is no longer available in telemetry of ↵Mark Felder
Phoenix 1.5+
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
2020-10-27Merge branch '1668-prometheus-access-restrictions' into 'develop'feld
[#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093
2020-10-27Merge branch 'develop' into 'feature/autofollowing'feld
# Conflicts: # CHANGELOG.md
2020-10-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-namelain
2020-10-23Merge branch '2242-nsfw-case' into 'develop'rinpatch
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive" Closes #2242 See merge request pleroma/pleroma!3094
2020-10-23User: Correctly handle whitespace names.lain
2020-10-22Merge branch 'chore/elixir-1.11' into 'develop'feld
Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059
2020-10-22SideEffects: Correctly handle chat messages sent to yourselflain
2020-10-20Fix credo warningsEgor Kislitsyn
2020-10-20Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-20Rename `Pleroma.Backup` to `Pleroma.User.Backup`Egor Kislitsyn
2020-10-19Fix credo warningsEgor Kislitsyn
2020-10-19Transmogrifier: Downcase incoming Hashtagslain
Also, set sensitive to true if we have an nsfw hashtag present.
2020-10-19Fix testsEgor Kislitsyn
2020-10-19Merge branch '2239-mute-fixes' into 'develop'Haelwenn
ActivityPub: Show own replies to muted users. Closes #2239 See merge request pleroma/pleroma!3084
2020-10-18[#1668] Restricted access to app metrics endpoint by default. Added ability ↵Ivan Tashkinov
to configure IP whitelist for this endpoint. Added tests and documentation.
2020-10-17Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11Ivan Tashkinov
2020-10-16Adds feature to permit e.g., local admins and community moderators to ↵Mark Felder
automatically follow all newly registered accounts
2020-10-15Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder
2020-10-15fix testMaksim Pechnikov
2020-10-15added generated `pleroma.env`Maksim Pechnikov
2020-10-15Fix warningsEgor Kislitsyn
2020-10-15ActivityPub: Show own replies to muted users.lain
Aligns mute with block behavior.
2020-10-14Merge branch 'develop' into feature/account-exportMark Felder
2020-10-14Merge branch 'feature/gen-magic' into 'develop'feld
Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534
2020-10-14Merge branch 'refactor/locked_user_field' into 'develop'Haelwenn
Change user.locked field to user.is_locked See merge request pleroma/pleroma!3077
2020-10-14Undo API breaking changesMark Felder
2020-10-14Finish undoing API breakageMark Felder
2020-10-14Undo API breaking changesMark Felder
2020-10-13Missed testsMark Felder
2020-10-13Move Consistency.FileLocation to ./testHaelwenn (lanodan) Monnier
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
2020-10-13CredoMark Felder
2020-10-13JPEG content_type must be image/jpegMark Felder
2020-10-13Merge branch 'develop' into feature/gen-magicMark Felder
2020-10-13Merge branch 'develop' into chore/elixir-1.11Mark Felder
2020-10-13Merge branch 'develop' into refactor/locked_user_fieldMark Felder
2020-10-13Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder
2020-10-13Change user.discoverable field to user.is_discoverableMark Felder
2020-10-13Change user.locked field to user.is_lockedMark Felder
2020-10-13changes after rebaseAlexander Strizhakov
2020-10-13changes after rebaseAlexander Strizhakov
2020-10-13credo fix after rebaseAlexander Strizhakov