summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-12-14Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-14Merge branch 'release/1.1.7' into 'stable'rinpatch
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
2019-12-13Add Kocaptcha endpoint to the test configrinpatch
2019-12-13.gitlab-ci.yml: bump rum postgres to non-bugged version and disablerinpatch
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
2019-12-13OTP releases: only set name and distribution type if not set alreadyrinpatch
2019-12-13OTP: Fix runtime upload limit config being ignoredrinpatch
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-13Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
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-12Remove runtime modules config exampleEgor Kislitsyn
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-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
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-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
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