aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-02-25Merge branch 'fix/dialyzer-warnings' into 'develop'rinpatch
2020-02-25Merge branch 'merge/admin-fe-20200225' into 'develop'feld
2020-02-25Update AdminFE buildMark Felder
2020-02-25Merge branch 'token-web-push-test' into 'develop'feld
2020-02-25Fix Dialyzer warningsEgor Kislitsyn
2020-02-25Add a test to ensure OAuth tokens are tied to Push subscriptionsEgor Kislitsyn
2020-02-25Merge branch 'test-fix' into 'develop'lain
2020-02-25compile fixAlexander Strizhakov
2020-02-25Document database default changeslain
2020-02-25Add :unnamed option to default database configurationlain
2020-02-24Merge branch 'fix/instance-gen-custom-static' into 'develop'rinpatch
2020-02-24instance.gen task: fix crash when using custom static directoryrinpatch
2020-02-24Merge branch 'status-visibility-count-stats' into 'develop'Haelwenn
2020-02-24Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility s...eugenijm
2020-02-24Merge branch 'theming_your_instance' into 'develop'lain
2020-02-24DOCS Theming your instanceIlja
2020-02-24Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'lain
2020-02-24Merge branch '1505-threads-federation' into 'develop'Haelwenn
2020-02-24Captcha: return invalid when answer_data is nilHaelwenn (lanodan) Monnier
2020-02-24captcha_test.exs: Use the same testing logic in Kocaptcha and nativeHaelwenn (lanodan) Monnier
2020-02-22Merge branch 'fix/missing-config-settings' into 'develop'feld
2020-02-22Add missing invites_enabled and account_activation_required settingsMark Felder
2020-02-22Better advice for vacuuming after restoring.lain
2020-02-22Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-feder...Ivan Tashkinov
2020-02-21Merge branch 'patch-1' into 'develop'lain
2020-02-21added why doing a vacuum after restoring a backup is so importantIgeljäger
2020-02-20Merge branch 'migration-fixes-20' into 'develop'Haelwenn
2020-02-20Merge branch 'fix/gin-fuzzy' into 'develop'Haelwenn
2020-02-20Merge branch 'single_emoji_reaction' into 'develop'Haelwenn
2020-02-20Apply database session parameter to improve GIN full text searchMark Felder
2020-02-20Migrations: Make them not fail for old databaseslain
2020-02-20[#1505] Typo fix.Ivan Tashkinov
2020-02-20Merge branch 'require-signature' into 'develop'lain
2020-02-20Merge branch 'features/remote-follow-userpage-redirect' into 'develop'lain
2020-02-20Merge branch 'docs_updating' into 'develop'lain
2020-02-20Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-feder...Ivan Tashkinov
2020-02-20Merge branch 'feature/new-registrations-digest' into 'develop'lain
2020-02-20[#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3Ivan Tashkinov
2020-02-20Merge branch 'tests-clear-config-tweaks' into 'develop'lain
2020-02-19Emoji Reactions: Add documentationlain
2020-02-19Pleroma API: Add endpoint to get reaction information on a single emojilain
2020-02-18Merge branch 'fix/mrf-sample-doc' into 'develop'feld
2020-02-18Merge branch 'develop' into 'fix/mrf-sample-doc'feld
2020-02-18Merge branch 'fix/mrf-docs' into 'develop'feld
2020-02-18Merge branch 'chore/config-descriptions' into 'develop'feld
2020-02-18Merge branch 'fix/status-view/expires_at' into 'develop'lain
2020-02-18Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config...Ivan Tashkinov
2020-02-18Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-feder...Ivan Tashkinov
2020-02-18Merge branch 'chore/standardize-mrf-behavior' into 'develop'lain
2020-02-18Merge branch 'need-reboot-flag' into 'develop'lain