aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-14Merge branch 'release/1.1.7' into 'stable'v1.1.7rinpatch
Release/1.1.7 See merge request pleroma/pleroma!2065
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-13remove a random testrinpatch
it's was already removed from develop in 4e535209172bb5460353fe011c06d127cfaa5847
2019-12-13Add Kocaptcha endpoint to the test configrinpatch
2019-12-13.gitlab-ci.yml: bump rum postgres to non-bugged version and disablerinpatch
--trace
2019-12-13mix.exs: bump version to 1.1.7rinpatch
2019-12-13changelog: add entry for bundled pleroma-fe changes on 1.1.7rinpatch
2019-12-13pleroma-fe bundle: update to 36910935727ad75616a60bfb4a1622df6a686b7brinpatch
2019-12-13changelog: entry for 1.1.7rinpatch
2019-12-13Add native captcha and enable it by default.Egor Kislitsyn
2019-12-13report federating status in nodeinfohref
2019-12-13Set better Cache-Control header for static contentrinpatch
Closes #1382
2019-12-13OTP releases: only set name and distribution type if not set alreadyrinpatch
Fixes not being able to run two OTP releases on one machine because of the name conflict.
2019-12-13OTP: Fix runtime upload limit config being ignoredrinpatch
Closes #1109
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
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
Do not apply http signature pipeline to the unsubscribe route See merge request pleroma/pleroma!2052