summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-03-12Don't expose remote accounts to search enginesfix/dont-expose-remote-accounts-to-search-enginesEgor Kislitsyn
2020-03-11Merge branch 'docs/new_user' into 'develop'rinpatch
2020-03-11Merge branch 'fix/signup-without-email' into 'develop'feld
2020-03-11Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'rinpatch
2020-03-11Merge branch 'relay-list-change' into 'develop'feld
2020-03-11using Pleroma.Config instead of etsAlexander Strizhakov
2020-03-11compile fixAlexander Strizhakov
2020-03-11merging release default config on app startAlexander Strizhakov
2020-03-11Merge branch 'docs/debian-install' into 'develop'rinpatch
2020-03-11CLI_tasks: Use manpage formatting conventionsHaelwenn (lanodan) Monnier
2020-03-11CLI_tasks/user.md: Fix `pleroma.user new` documentationHaelwenn (lanodan) Monnier
2020-03-11Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop'Haelwenn
2020-03-11static-fe.css: Restore from before a65ee8eaHaelwenn (lanodan) Monnier
2020-03-10Merge branch 'fix/post-length-validation' into 'develop'lain
2020-03-10Fix enforcement of character limitsMark Felder
2020-03-10installation/otp_en.md: Fix pleroma.nginx target [deb]Haelwenn (lanodan) Monnier
2020-03-09Merge branch 'patch-1' into 'develop'lain
2020-03-08Merge branch 'chore/mix-version-bump' into 'develop'rinpatch
2020-03-08mix.exs: bump version to development onerinpatch
2020-03-08Merge branch 'stable' into 'develop'rinpatch
2020-03-08Merge branch 'release/2.0.0' into 'stable'v2.0.0rinpatch
2020-03-07pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6afrinpatch
2020-03-07Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'rinpatch
2020-03-07moderation log: fix improperly migrated datarinpatch
2020-03-07wait in mix task while pleroma is rebootedAlexander Strizhakov
2020-03-07Merge branch 'restart-fix-for-mix-tasks' into 'develop'rinpatch
2020-03-06Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'rinpatch
2020-03-06Merge branch 'revert-67cc4dce' into 'develop'feld
2020-03-06Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"feld
2020-03-06Remove EmojiPacks from AdminFE buildMark Felder
2020-03-06Merge branch 'update/admin-fe-without-emojipack' into 'develop'lain
2020-03-06Remove emoji support from AdminFEMark Felder
2020-03-05pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4ddrinpatch
2020-03-05Merge branch 'stable' into release/2.0.0rinpatch
2020-03-05Merge branch 'stable' into release/2.0.0rinpatch
2020-03-05version bump changelog and mix versionrinpatch
2020-03-05changelog: sync with stablerinpatch
2020-03-05Merge branch 'proper_error_messages' into 'develop'lain
2020-03-05Admin API tests: Fix wrong test.lain
2020-03-05Merge branch 'fix/stats-on-startup' into 'develop'Haelwenn
2020-03-04Document the instance stats fixMark Felder
2020-03-04Generate instance stats on startupMark Felder
2020-03-04Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'feld
2020-03-04MastodonController: Return 404 errors correctly.lain
2020-03-04Merge branch 'fix/no-email-no-fail' into 'develop'lain
2020-03-03Merge branch 'chore/update-copyrights' into 'develop'Haelwenn
2020-03-03Older copyright updatesMark Felder
2020-03-03Update CopyrightsMark Felder
2020-03-03Merge remote-tracking branch 'origin/develop' into fix/signup-without-emailEgor Kislitsyn
2020-03-02Merge branch 'prepared-statements-settings' into 'develop'lain