summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-11-12Merge branch 'release/2.2.0' into 'stable'v2.2.0rinpatch
2020-11-11pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983adrinpatch
2020-11-11Polish the changelog a bit and specify release daterinpatch
2020-11-11changes after rebaseAlexander Strizhakov
2020-11-05CHANGELOG.md: Add an entry for the spoofing fixrinpatch
2020-11-05Merge branch 'fix/object-attachment-spoof' into 'develop'rinpatch
2020-11-05Merge branch '2236-no-name' into 'develop'Haelwenn
2020-11-05phoenix_controller_render_duration is no longer available in telemetry of Pho...Mark Felder
2020-11-05Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' i...feld
2020-11-05Merge branch '1668-prometheus-access-restrictions' into 'develop'feld
2020-11-05Merge branch '2242-nsfw-case' into 'develop'rinpatch
2020-11-05Merge branch 'issue/2261' into 'develop'feld
2020-11-04Merge branch '2257-self-chat' into 'develop'rinpatch
2020-11-04Merge branch 'chore/elixir-1.11' into 'develop'feld
2020-11-04Merge branch 'instance-docs' into 'develop'feld
2020-11-04Merge branch 'tesla-get-to-pleroma' into 'develop'feld
2020-10-21Rip out fedsockets from the release branchrinpatch
2020-10-15SECURITY.md: update supported versions to only 2.2rinpatch
2020-10-15CHANGELOG.md: prepare 2.2.0 changelogrinpatch
2020-10-15mix.exs: bump version to 2.2.0rinpatch
2020-10-14Merge branch 'docs-indigenous' into 'develop'feld
2020-10-14Change handle and url of contact person for Indigenous clientswentel
2020-10-14Merge branch 'feature/gen-magic' into 'develop'feld
2020-10-14Merge branch 'refactor/locked_user_field' into 'develop'Haelwenn
2020-10-14Undo API breaking changesMark Felder
2020-10-13Missed testsMark Felder
2020-10-13Merge branch 'bugfix/file-consistency-prod' into 'develop'Haelwenn
2020-10-13Move Consistency.FileLocation to ./testHaelwenn (lanodan) Monnier
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 refactor/locked_user_fieldMark Felder
2020-10-13Merge branch 'feature/1822-files-consistency' into 'develop'feld
2020-10-13Change user.locked field to user.is_lockedMark Felder
2020-10-13changes after rebaseAlexander Strizhakov
2020-10-13migration and warning for RemoteIp plug renameAlexander Strizhakov
2020-10-13changes after rebaseAlexander Strizhakov
2020-10-13credo fix after rebaseAlexander Strizhakov
2020-10-13changes after rebaseAlexander Strizhakov
2020-10-13fixes after rebaseAlexander Strizhakov
2020-10-13rebaseAlexander Strizhakov
2020-10-13changes after rebaseAlexander Strizhakov
2020-10-13fixes after rebaseAlexander Strizhakov
2020-10-13exclude file_location check from coverallsAlexander Strizhakov
2020-10-13fix after rebaseAlexander Strizhakov
2020-10-13files consistency after rebaseAlexander Strizhakov
2020-10-13files consistency for new filesAlexander Strizhakov
2020-10-13fix after rebaseAlexander Strizhakov
2020-10-13update files consistency after rebaseAlexander Strizhakov
2020-10-13copyrightAlexander Strizhakov
generated by cgit v1.2.3 (git 2.44.0) at 2024-04-26 12:36:47 +0000