aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-12-20Remove `/api/account/register` documentation from pleroma_api.mdEgor Kislitsyn
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-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 'kocaptcha-default-endpoint' into 'develop'rinpatch
2019-12-16Add Kocaptcha endpoint to config.exsEgor Kislitsyn
2019-12-16Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"Egor Kislitsyn
2019-12-16Add default endpoint to Pleroma.Captcha.KocaptchaEgor Kislitsyn
2019-12-16formattingrinpatch
2019-12-16tests: significantly reduce streamer timeoutrinpatch
2019-12-16tests: remove a useless sleep in rate limiter testsrinpatch
2019-12-16tests: remove a useless 1 second sleeprinpatch
2019-12-16tests: remove a useless 3 second sleeprinpatch
2019-12-16tests: Replace 2 second sleep with offseting updated_atrinpatch
2019-12-13Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop'Haelwenn
2019-12-13Publisher: check out a connection for inserting publish_one jobsrinpatch
2019-12-12Merge branch 'feature/native-captcha' into 'develop'lain
2019-12-12Merge branch 'uguu' into 'develop'lain
2019-12-12Update frontendlain
2019-12-12Merge branch '1427-oauth-graceful-admin-scope' into 'develop'lain
2019-12-12[#1427] Graceful clearance of OAuth admin scopes for non-admin users (no erro...Ivan Tashkinov
2019-12-12Add Kocaptcha endpoint to the test configEgor Kislitsyn
2019-12-12Add native captcha and enable it by default.Egor Kislitsyn
2019-12-12Merge branch 'revert-bca1512d' into 'develop'lain
2019-12-12Revert "Merge branch 'admin-scope-support-code' into 'develop'"lain
2019-12-12Merge branch 'test-timeout' into 'develop'lain
2019-12-12Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'lain
2019-12-11Merge branch 'feature/report-notes' into 'develop'feld
2019-12-12Merge branch 'develop' into feature/report-notesMaxim Filippov
2019-12-11Merge branch 'issue/1411' into 'develop'feld
2019-12-11Document the favorites timeline order changeMark Felder
2019-12-11Merge branch 'develop' into issue/1411Mark Felder
2019-12-11try local shedulingstwf
2019-12-11Merge branch 'chore/fast_sanitize_bump' into 'develop'rinpatch
2019-12-11mix.lock: update fast_sanitizerinpatch
2019-12-11Merge branch 'admin-scope-support-code' into 'develop'rinpatch
2019-12-11Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.Ivan Tashkinov
2019-12-11AdminAPI: Merge account views for list instance statusesMaxim Filippov
2019-12-11Merge branch 'domain-block-precedence' into 'develop'rinpatch
2019-12-11remove single-step pipeSadposter
2019-12-11Merge branch '1427-oauth-admin-scopes' into 'develop'lain
2019-12-11[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.Ivan Tashkinov
2019-12-10Apply suggestion to lib/pleroma/user.exSadposter
2019-12-10Merge branch 'fix/unsubscribe-route' into 'develop'feld
2019-12-10Merge branch 'develop' into 'domain-block-precedence'Sadposter
2019-12-10make analysis happySadposter