summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-11Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-10don't migrate prometheus settingsAlexander Strizhakov
2020-01-10more renamingsAlexander Strizhakov
2020-01-10don't migrate configurable_from_database settingAlexander Strizhakov
2020-01-10dynamic_configuration renamingAlexander Strizhakov
and moving it from instance settings
2020-01-10fix for pleroma assets group updateAlexander Strizhakov
2020-01-10syncing new setting to descriptions.exsAlexander Strizhakov
2020-01-10Merge branch 'issue/1490' into 'develop'lain
[#1490] fixed create service user (relay, internal.fetch) See merge request pleroma/pleroma!2092
2020-01-10Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'lain
OAuth tweaks and tests rework See merge request pleroma/pleroma!2068
2020-01-10Update AdminFE buildAlexander Strizhakov
2020-01-10deep merge in config updateAlexander Strizhakov
2020-01-10flag for delete fixAlexander
2020-01-10little fixes and typos fixAlexander
2020-01-10fixes for logger backendsAlexander
2020-01-10fix for subgroup tupleAlexander
added settings for swoosh adapters local
2020-01-10logger backends fixAlexander
2020-01-10parsing proxy url settingAlexander
2020-01-10suggestions fixAlexander
2020-01-10typo fixAlexander
2020-01-10adapter childrenAlexander
2020-01-10fix for endpoints after env updateAlexander
2020-01-10test fixes after rebaseAlexander
2020-01-10errors on endpointsAlexander
2020-01-10partially settings updateAlexander
2020-01-10tests for setttings without an explicit keyAlexander
2020-01-10config editing through databaseAlex S
2020-01-10Merge branch 'fix/captcha-time' into 'develop'lain
Fix captcha time, which was meant to be 5 minutes See merge request pleroma/pleroma!2094
2020-01-09Fix captcha time, which was meant to be 5 minutesMark Felder
2020-01-09Merge branch 'update/adminfe-20201019' into 'develop'feld
Update AdminFE build See merge request pleroma/pleroma!2093
2020-01-09Update AdminFE buildMark Felder
2020-01-08fix create service actorMaksim Pechnikov
2020-01-07Merge branch 'bugfix/smtp-config-examples' into 'develop'rinpatch
Fix SMTP mailer example See merge request pleroma/pleroma!2091
2020-01-05Fix SMTP mailer exampleRX14
`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the same SMTP connection, causing it to fail.
2020-01-02Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
oauth-scopes-tweaks-and-tests
2019-12-28Merge branch 'update-captcha' into 'develop'rinpatch
Update `captcha` dependency Closes #1492 See merge request pleroma/pleroma!2088
2019-12-28Update `captcha` dependencyEgor Kislitsyn
2019-12-24Merge branch 'feat/doc-improvements' into 'develop'Haelwenn
Documentation imrpovements See merge request pleroma/pleroma!2084
2019-12-23Merge branch 'increase-captcha-expiry-time' into 'develop'lain
Increase CAPTCHA expiration time to 5 minutes Closes #1491 See merge request pleroma/pleroma!2086
2019-12-23Increase CAPTCHA expiration time to 5 minutesEgor Kislitsyn
2019-12-21Merge branch 'feature/custom-runtime-modules' into 'develop'rinpatch
Add support for custom modules at runtime Closes #1448 See merge request pleroma/pleroma!2039
2019-12-21Merge branch 'revert-a54aa5af' into 'develop'rinpatch
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'" Closes #1488 See merge request pleroma/pleroma!2083
2019-12-21Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"Maxim Filippov
This reverts merge request !2076
2019-12-20Merge branch 'fix/twitter-card-without-attachments' into 'develop'feld
Posts without media attachments should get the Summary TwitterCard See merge request pleroma/pleroma!2082
2019-12-20Posts without media attachments should get the Summary TwitterCardMark Felder
2019-12-20Merge branch 'feature/status-counts-by-scope' into 'develop'feld
Stats: return status counts by scope See merge request pleroma/pleroma!2076
2019-12-20Merge branch 'fix/remote-user-no-follower-counter' into 'develop'feld
Do not crash when remote user follower and following counters are hidden See merge request pleroma/pleroma!2077
2019-12-20Merge branch 'remove-outdated-doc' into 'develop'Haelwenn
Remove `/api/account/register` documentation from pleroma_api.md Closes #1486 See merge request pleroma/pleroma!2078
2019-12-20Remove `/api/account/register` documentation from pleroma_api.mdEgor Kislitsyn
2019-12-19Fix all countMaxim Filippov
2019-12-19Expose issue via failing testMaxim Filippov
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-10 19:27:53 +0000