summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
ostatus-controller-no-auth-check-on-non-federating-instances # Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex
2020-10-15Merge branch 'refactor/discoverable_user_field' into 'develop'feld
Change user.discoverable field to user.is_discoverable See merge request pleroma/pleroma!3078
2020-10-15Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder
2020-10-15Apply 1 suggestion(s) to 1 file(s)Haelwenn
2020-10-15Merge branch 'issue/2009' into 'develop'feld
[#2009] fixed install docs (release env) See merge request pleroma/pleroma!2854
2020-10-15fix testMaksim Pechnikov
2020-10-15added generate the release env to `pleroma.instance gen`Maksim Pechnikov
2020-10-15fixed install docsMaksim Pechnikov
2020-10-15fix docsMaksim Pechnikov
2020-10-15Apply 1 suggestion(s) to 1 file(s)Maksim
2020-10-15Apply 1 suggestion(s) to 1 file(s)Maksim
2020-10-15update task messagesMaksim Pechnikov
2020-10-15added generated `pleroma.env`Maksim Pechnikov
2020-10-14Merge branch 'docs-indigenous' into 'develop'feld
Change handle and url of contact person for Indigenous client See merge request pleroma/pleroma!3082
2020-10-14Apply 3 suggestion(s) to 3 file(s)feld
2020-10-14Change handle and url of contact person for Indigenous clientswentel
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-13Merge branch 'bugfix/file-consistency-prod' into 'develop'Haelwenn
Move Consistency.FileLocation to ./test See merge request pleroma/pleroma!3079
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 refactor/locked_user_fieldMark Felder
2020-10-13Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder
2020-10-13Merge branch 'feature/1822-files-consistency' into 'develop'feld
Feature/1822 files consistency Closes #1822 See merge request pleroma/pleroma!2680
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-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
2020-10-13updates after rebaseAlexander Strizhakov
2020-10-13special namespaces for phoenix and api_specAlexander Strizhakov
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-10 01:50:24 +0000