aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2020-01-28Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-27Remove user recommendation by third party engineHakaba Hitoyo
2020-01-27little fixesAlexander Strizhakov
2020-01-27Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-25description typos, Oban verbose type fix, new keysAlexander Strizhakov
2020-01-25[#1505] Background fetching of incoming activities' `replies` collections.Ivan Tashkinov
2020-01-24Merge branch 'fix/better-descriptions-for-email-fields' into 'develop'feld
Better descriptions for email fields for admin-fe Closes admin-fe#67 See merge request pleroma/pleroma!2138
2020-01-24better descriptions for email fields for admin-feAlexander Strizhakov
2020-01-24removing deleted MDII uploader from suggestionsAlexander Strizhakov
2020-01-23Add NewUsersDigestEmail to config/description.exsEgor Kislitsyn
2020-01-22Merge branch 'develop' into feature/new-registrations-digestMark Felder
2020-01-22[#1505] Added Mastodon-compatible `replies` collection to Note federated ↵Ivan Tashkinov
representation.
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-22Merge branch 'develop' into feature/new-registrations-digestEgor Kislitsyn
2020-01-22Disable NewUsersDigestEmail by defaultEgor Kislitsyn
2020-01-22Add new users digest emailEgor Kislitsyn
2020-01-22Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-21Add delete_attachments queue to configRoman Chvanikov
2020-01-21some refactor and testsAlexander Strizhakov
2020-01-21Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-18releases supportAlexander Strizhakov
2020-01-18full update for some subkeysAlexander Strizhakov
2020-01-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks
2020-01-14short labels and fixes for typosAlexander Strizhakov
2020-01-14Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-13Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-12Merge branch 'config/benchmark' into 'develop'feld
Benchmark env uses test database so we should be able to use test.secret.exs See merge request pleroma/pleroma!2057
2020-01-11Remove MDII uploaderHakaba Hitoyo
2020-01-10dynamic_configuration renamingAlexander Strizhakov
and moving it from instance settings
2020-01-10syncing new setting to descriptions.exsAlexander Strizhakov
2020-01-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks # Conflicts: # lib/pleroma/user.ex
2020-01-10little fixes and typos fixAlexander
2020-01-10fix for subgroup tupleAlexander
added settings for swoosh adapters local
2020-01-10suggestions fixAlexander
2020-01-10adapter childrenAlexander
2020-01-10config editing through databaseAlex S
2020-01-10[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, ↵Ivan Tashkinov
migrated existing OAuth records. Adjusted tests.
2020-01-09Fix captcha time, which was meant to be 5 minutesMark Felder
2019-12-23Increase CAPTCHA expiration time to 5 minutesEgor Kislitsyn
2019-12-21Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-19Instead allow a dedicated benchmark configMark Felder
2019-12-19Merge branch 'develop' into config/benchmarkMark Felder
2019-12-16Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-16Add an option to require fetches to be signedEgor Kislitsyn
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-14Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-13Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn