Age | Commit message (Collapse) | Author | |
---|---|---|---|
2020-10-26 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵ | lain | |
alexgleason/pleroma-block-behavior | |||
2020-10-23 | Merge 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-22 | Merge branch 'chore/elixir-1.11' into 'develop' | feld | |
Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059 | |||
2020-10-22 | SideEffects: Correctly handle chat messages sent to yourself | lain | |
2020-10-19 | Transmogrifier: Downcase incoming Hashtags | lain | |
Also, set sensitive to true if we have an nsfw hashtag present. | |||
2020-10-19 | Merge branch '2239-mute-fixes' into 'develop' | Haelwenn | |
ActivityPub: Show own replies to muted users. Closes #2239 See merge request pleroma/pleroma!3084 | |||
2020-10-17 | Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11 | Ivan Tashkinov | |
2020-10-15 | Merge branch 'develop' into refactor/discoverable_user_field | Mark Felder | |
2020-10-15 | fix test | Maksim Pechnikov | |
2020-10-15 | added generated `pleroma.env` | Maksim Pechnikov | |
2020-10-15 | Fix warnings | Egor Kislitsyn | |
2020-10-15 | ActivityPub: Show own replies to muted users. | lain | |
Aligns mute with block behavior. | |||
2020-10-14 | Merge branch 'feature/gen-magic' into 'develop' | feld | |
Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534 | |||
2020-10-14 | Merge branch 'refactor/locked_user_field' into 'develop' | Haelwenn | |
Change user.locked field to user.is_locked See merge request pleroma/pleroma!3077 | |||
2020-10-14 | Undo API breaking changes | Mark Felder | |
2020-10-14 | Finish undoing API breakage | Mark Felder | |
2020-10-14 | Undo API breaking changes | Mark Felder | |
2020-10-13 | Merge remote-tracking branch 'upstream/develop' into block-behavior | Alex Gleason | |
2020-10-13 | Missed tests | Mark Felder | |
2020-10-13 | Move Consistency.FileLocation to ./test | Haelwenn (lanodan) Monnier | |
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod | |||
2020-10-13 | Credo | Mark Felder | |
2020-10-13 | JPEG content_type must be image/jpeg | Mark Felder | |
2020-10-13 | Merge branch 'develop' into feature/gen-magic | Mark Felder | |
2020-10-13 | Merge branch 'develop' into chore/elixir-1.11 | Mark Felder | |
2020-10-13 | Merge branch 'develop' into refactor/locked_user_field | Mark Felder | |
2020-10-13 | Merge branch 'develop' into refactor/discoverable_user_field | Mark Felder | |
2020-10-13 | Change user.discoverable field to user.is_discoverable | Mark Felder | |
2020-10-13 | Change user.locked field to user.is_locked | Mark Felder | |
2020-10-13 | changes after rebase | Alexander Strizhakov | |
2020-10-13 | changes after rebase | Alexander Strizhakov | |
2020-10-13 | credo fix after rebase | Alexander Strizhakov | |
2020-10-13 | changes after rebase | Alexander Strizhakov | |
2020-10-13 | fixes after rebase | Alexander Strizhakov | |
2020-10-13 | rebase | Alexander Strizhakov | |
2020-10-13 | changes after rebase | Alexander Strizhakov | |
2020-10-13 | fix after rebase | Alexander Strizhakov | |
2020-10-13 | files consistency after rebase | Alexander Strizhakov | |
2020-10-13 | files consistency for new files | Alexander Strizhakov | |
2020-10-13 | update files consistency after rebase | Alexander Strizhakov | |
2020-10-13 | updates after rebase | Alexander Strizhakov | |
2020-10-13 | alias alphabetically order | Alexander Strizhakov | |
2020-10-13 | AdminSecretAuthenticationPlug module name | Alexander Strizhakov | |
2020-10-13 | AuthenticationPlug module name | Alexander Strizhakov | |
2020-10-13 | BasicAuthDecoderPlug module name | Alexander Strizhakov | |
2020-10-13 | Cache plug module name | Alexander Strizhakov | |
2020-10-13 | EnsureAuthenticatedPlug module name | Alexander Strizhakov | |
2020-10-13 | EnsurePublicOrAuthenticatedPlug module name | Alexander Strizhakov | |
2020-10-13 | EnsureUserKeyPlug module name | Alexander Strizhakov | |
2020-10-13 | ExpectAuthenticatedCheckPlug module name | Alexander Strizhakov | |
2020-10-13 | ExpectPublicOrAuthenticatedCheckPlug module name | Alexander Strizhakov | |