aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-11Merge branch 'patch-1' into 'develop'rinpatch
docs: API: update Mastodon API link See merge request pleroma/pleroma!2100
2020-01-11Merge branch 'remove/remove-mdii-uploader' into 'develop'rinpatch
Remove MDII uploader See merge request pleroma/pleroma!2099
2020-01-11Remove MDII uploaderHakaba Hitoyo
2020-01-11Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-11docs: API: update Mastodon API linkAlibek Omarov
2020-01-10Update Dockerfile with labels. Update gitlab-ci for registry usagejp
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 remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks # Conflicts: # lib/pleroma/user.ex
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-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
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-06Update CHANGELOG.mdlain
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-05Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing ↵eugenijm
updated_at and bringing conversation to the top in the user's direct conversation list
2020-01-03fixed Metadata.Utils.scrub_html_and_truncateMaksim Pechnikov
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-25added code of mr#2067Maksim Pechnikov
2019-12-24Merge branch 'feat/doc-improvements' into 'develop'Haelwenn
Documentation imrpovements See merge request pleroma/pleroma!2084
2019-12-24fix oauth scopes for AdminApi#reports_updateMaksim Pechnikov
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 09:42:49 +0000