aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-24Merge branch '1505-threads-federation' into 'develop'Haelwenn
[#1505] Threads / replies federation Closes #1505 See merge request pleroma/pleroma!2129
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-22[#1560] Restricted AP- & OStatus-related routes for non-federating instances.Ivan Tashkinov
2020-02-22Merge branch 'fix/missing-config-settings' into 'develop'feld
Add missing invites_enabled and account_activation_required settings See merge request pleroma/pleroma!2234
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 ↵Ivan Tashkinov
1505-threads-federation # Conflicts: # CHANGELOG.md # config/config.exs
2020-02-21Merge branch 'patch-1' into 'develop'lain
added why doing a vacuum after restoring a backup is so important See merge request pleroma/pleroma!2230
2020-02-21added why doing a vacuum after restoring a backup is so importantIgeljäger
2020-02-21fix for timeout clauseAlexander Strizhakov
2020-02-21hackney pool timeoutAlexander Strizhakov
2020-02-21don't log info ssl messagesAlexander Strizhakov
2020-02-21more info in Connections.checkin timout errorsAlexander Strizhakov
2020-02-21by default don't use gun retriesAlexander Strizhakov
remove conn depends on retry setting from config
2020-02-21temp using tesla from forkAlexander Strizhakov
2020-02-21Merge branch 'develop' into gunAlexander Strizhakov
2020-02-20Merge branch 'migration-fixes-20' into 'develop'Haelwenn
Migrations: Make them not fail for old databases See merge request pleroma/pleroma!2227
2020-02-20Merge branch 'fix/gin-fuzzy' into 'develop'Haelwenn
Improve GIN full text search performance See merge request pleroma/pleroma!2228
2020-02-20Merge branch 'single_emoji_reaction' into 'develop'Haelwenn
Single emoji reaction Closes #1578 See merge request pleroma/pleroma!2226
2020-02-20Apply database session parameter to improve GIN full text searchMark Felder
2020-02-20init.d/pleroma: Add option to attach an elixir consoleHaelwenn (lanodan) Monnier
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
Add an option to require fetches to be signed Closes #1444 See merge request pleroma/pleroma!2071
2020-02-20Merge branch 'features/remote-follow-userpage-redirect' into 'develop'lain
remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123
2020-02-20Merge branch 'docs_updating' into 'develop'lain
DOCS Add OTP to updating.md See merge request pleroma/pleroma!2108
2020-02-20Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation # Conflicts: # config/config.exs
2020-02-20Merge branch 'feature/new-registrations-digest' into 'develop'lain
New users digest email Closes #1514 See merge request pleroma/pleroma!2128
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
Tweaks to `clear_config` calls in tests See merge request pleroma/pleroma!2209
2020-02-19Emoji Reactions: Add documentationlain
2020-02-19Pleroma API: Add endpoint to get reaction information on a single emojilain
2020-02-19removing retry option and changing some logger messages levelsAlexander Strizhakov
2020-02-18Merge branch 'fix/mrf-sample-doc' into 'develop'feld
Update MRF docs, make sample code actually compile See merge request pleroma/pleroma!2210
2020-02-18Merge branch 'develop' into 'fix/mrf-sample-doc'feld
# Conflicts: # docs/configuration/mrf.md
2020-02-18Merge branch 'fix/mrf-docs' into 'develop'feld
Fix MRF documentation See merge request pleroma/pleroma!2187
2020-02-18Merge branch 'chore/config-descriptions' into 'develop'feld
Additional config description improvements See merge request pleroma/pleroma!2207
2020-02-18Spelling was wrong in test as wellMark Felder
2020-02-18SpellingMark Felder
2020-02-18Improve changelog messageMark Felder
2020-02-18Merge branch 'develop' into gunMark Felder
2020-02-18Merge branch 'fix/status-view/expires_at' into 'develop'lain
Fix `status.expires_at` type Closes #1573 See merge request pleroma/pleroma!2222
2020-02-18Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
tests-clear-config-tweaks # Conflicts: # test/web/admin_api/admin_api_controller_test.exs
2020-02-18Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation
2020-02-18Merge branch 'chore/standardize-mrf-behavior' into 'develop'lain
Standardize @behaviour usage in MRFs See merge request pleroma/pleroma!2212
2020-02-18Merge branch 'need-reboot-flag' into 'develop'lain
need_reboot flag for adminFE See merge request pleroma/pleroma!2188
2020-02-18Add a testEgor Kislitsyn
2020-02-18Merge branch 'chore/floki-update' into 'develop'lain
Update floki to 0.25 See merge request pleroma/pleroma!2217
2020-02-18Fix `status.expires_at` typeEgor Kislitsyn