aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-01-09Fix captcha time, which was meant to be 5 minutesMark Felder
2020-01-09Merge branch 'update/adminfe-20201019' into 'develop'feld
2020-01-09Update AdminFE buildMark Felder
2020-01-08fix create service actorMaksim Pechnikov
2020-01-07Merge branch 'bugfix/smtp-config-examples' into 'develop'rinpatch
2020-01-06Update CHANGELOG.mdlain
2020-01-05Fix SMTP mailer exampleRX14
2020-01-05Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_a...eugenijm
2020-01-03fixed Metadata.Utils.scrub_html_and_truncateMaksim Pechnikov
2020-01-02Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweak...Ivan Tashkinov
2019-12-28Merge branch 'update-captcha' into 'develop'rinpatch
2019-12-28Update `captcha` dependencyEgor Kislitsyn
2019-12-25added code of mr#2067Maksim Pechnikov
2019-12-24Merge branch 'feat/doc-improvements' into 'develop'Haelwenn
2019-12-24fix oauth scopes for AdminApi#reports_updateMaksim Pechnikov
2019-12-23Merge branch 'increase-captcha-expiry-time' into 'develop'lain
2019-12-23Increase CAPTCHA expiration time to 5 minutesEgor Kislitsyn
2019-12-22update testMaksim Pechnikov
2019-12-22Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.exMaksim
2019-12-22Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_con...Maksim
2019-12-21moved remote follow in separate controllerMaksim Pechnikov
2019-12-21Merge branch 'feature/custom-runtime-modules' into 'develop'rinpatch
2019-12-21Merge branch 'revert-a54aa5af' into 'develop'rinpatch
2019-12-21Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"Maxim Filippov
2019-12-20Merge branch 'fix/twitter-card-without-attachments' into 'develop'feld
2019-12-20Posts without media attachments should get the Summary TwitterCardMark Felder
2019-12-20Merge branch 'feature/status-counts-by-scope' into 'develop'feld
2019-12-20Merge branch 'fix/remote-user-no-follower-counter' into 'develop'feld
2019-12-20fixed remote followMaksim Pechnikov
2019-12-20Merge branch 'remove-outdated-doc' into 'develop'Haelwenn
2019-12-20Remove `/api/account/register` documentation from pleroma_api.mdEgor Kislitsyn
2019-12-19Instead allow a dedicated benchmark configMark Felder
2019-12-19Merge branch 'develop' into config/benchmarkMark Felder
2019-12-19Fix all countMaxim Filippov
2019-12-19Expose issue via failing testMaxim Filippov
2019-12-19Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweak...Ivan Tashkinov
2019-12-19[#2068] Introduced proper OAuth tokens usage to controller tests.Ivan Tashkinov
2019-12-19Return 404 if account to filter notifications from is not foundEgor Kislitsyn
2019-12-19Do not crash when remote user follower and following counters are hiddenEgor Kislitsyn
2019-12-18Stats: return status counts by scopeMaxim Filippov
2019-12-17Merge branch 'feature/add-event-support' into 'develop'rinpatch
2019-12-17Merge branch 'ci/rum-testing-no-recompilation' into 'develop'rinpatch
2019-12-17CI: Add a cache policy for test jobs and fix rum tests recompilingrinpatch
2019-12-17Add ActivityPub Object Event type supportThomas Citharel
2019-12-17Add support for `account_id` param to filter notifications by the accountEgor Kislitsyn
2019-12-17Merge branch 'hide-followers-count' into 'develop'Haelwenn
2019-12-17Hide follower counter when hiding is activatedEgor Kislitsyn
2019-12-16Merge branch 'fix/remove-useless-sleep' into 'develop'lain
2019-12-16Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-16Merge branch 'kocaptcha-default-endpoint' into 'develop'rinpatch