summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-17Hide follower counter when hiding is activatedEgor Kislitsyn
2019-12-17Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2019-12-16Merge branch 'fix/remove-useless-sleep' into 'develop'lain
Remove useless sleeping/reduce it See merge request pleroma/pleroma!2069
2019-12-16Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-16Merge branch 'kocaptcha-default-endpoint' into 'develop'rinpatch
Add default endpoint to Pleroma.Captcha.Kocaptcha See merge request pleroma/pleroma!2070
2019-12-16Add Kocaptcha endpoint to config.exsEgor Kislitsyn
2019-12-16Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"Egor Kislitsyn
This reverts commit 82c62c5028f517ded121b46b9806053989defdc2.
2019-12-16Add default endpoint to Pleroma.Captcha.KocaptchaEgor Kislitsyn
2019-12-16formattingrinpatch
2019-12-16tests: significantly reduce streamer timeoutrinpatch
there is no reason IPC between two processes on the same node should take 4 seconds
2019-12-16tests: remove a useless sleep in rate limiter testsrinpatch
It was used to check that authenticated and unauthenticated users have different limits. Instead of sleeping a super low limit for unauthenticated users was set, preventing them from doing 5 requests in the first place.
2019-12-16tests: remove a useless 1 second sleeprinpatch
there is no need to wait for the task to finish, it will be deleted when the transaction is aborted anyway.
2019-12-16tests: remove a useless 3 second sleeprinpatch
the ids favs use are accurate down to a microsecond, there is no need for it
2019-12-16tests: Replace 2 second sleep with offseting updated_atrinpatch
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵Ivan Tashkinov
controller tests modification: OAuth scopes usage.
2019-12-14Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-14Disable rate limiter for socket/localhost (unless RemoteIp is enabled)Maxim Filippov
2019-12-13Don't log when users or objects are deleted.Phil Hagelberg
2019-12-13Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop'Haelwenn
Publisher: check out a connection for inserting publish_one jobs See merge request pleroma/pleroma!2063
2019-12-13Publisher: check out a connection for inserting publish_one jobsrinpatch
Related to #1474, federation of one post on my istance creates in best-case 360 jobs, so if they for some reason take a while to insert, it will exhaust the connection pool. This fixes it by checking out one dedicated connection for inserting them.
2019-12-13Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-12Merge branch 'feature/native-captcha' into 'develop'lain
Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060
2019-12-12Merge branch 'uguu' into 'develop'lain
Update frontend See merge request pleroma/pleroma!2062
2019-12-12Update frontendlain
2019-12-12Merge branch '1427-oauth-graceful-admin-scope' into 'develop'lain
[#1427] Graceful clearance of OAuth admin scopes for non-admin users Closes #1427 See merge request pleroma/pleroma!2061
2019-12-12[#1427] Graceful clearance of OAuth admin scopes for non-admin users (no ↵Ivan Tashkinov
error raised). PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
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
Revert "Merge branch 'admin-scope-support-code' into 'develop'" See merge request pleroma/pleroma!2059
2019-12-12Revert "Merge branch 'admin-scope-support-code' into 'develop'"lain
This reverts merge request !2055
2019-12-12Merge branch 'test-timeout' into 'develop'lain
Fix intermittent failures in federated testing See merge request pleroma/pleroma!2058
2019-12-12Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'lain
AdminAPI: Merge account views for list instance statuses See merge request pleroma/pleroma!2054
2019-12-12Remove runtime modules config exampleEgor Kislitsyn
2019-12-11Merge branch 'feature/report-notes' into 'develop'feld
AdminAPI: Add report notes See merge request pleroma/pleroma!2031
2019-12-12Merge branch 'develop' into feature/report-notesMaxim Filippov
2019-12-11Merge branch 'issue/1411' into 'develop'feld
[#1411] /api/v1/favourites: added sorting for activites by adds to favorites See merge request pleroma/pleroma!1991
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-11Benchmark env uses test database so we should be able to use test.secret.exsMark Felder
2019-12-11Merge branch 'chore/fast_sanitize_bump' into 'develop'rinpatch
mix.lock: update fast_sanitize See merge request pleroma/pleroma!2056
2019-12-11mix.lock: update fast_sanitizerinpatch
the new version uses html-spec compliant fragment parsing instead of just wrapping the fragment in the <body> tag.
2019-12-11Merge branch 'admin-scope-support-code' into 'develop'rinpatch
FE bundle updates: admin-fe and pleroma-fe See merge request pleroma/pleroma!2055
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-11Update CHANGELOGEgor Kislitsyn
2019-12-11Set log level to debug for not important messagesEgor Kislitsyn
2019-12-11Merge branch 'domain-block-precedence' into 'develop'rinpatch
make follows take precedence over domain blocks See merge request pleroma/pleroma!2019
2019-12-11remove single-step pipeSadposter
2019-12-11Merge branch '1427-oauth-admin-scopes' into 'develop'lain
[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests Closes #1427 See merge request pleroma/pleroma!2053
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-07 04:23:44 +0000