aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-12Merge branch 'feature/attachments-cleanup' into 'develop'feld
Delete attachments when status is deleted See merge request pleroma/pleroma!2036
2020-01-12Delete attachments when status is deletedRoman Chvanikov
2020-01-12Merge branch 'updated-at-on-conversation-read' into 'develop'feld
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`) See merge request pleroma/pleroma!2080
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-12Merge branch 'issue/1354' into 'develop'feld
[#1354] fix remote follow See merge request pleroma/pleroma!2079
2020-01-12Assign token that can write to followsMark Felder
2020-01-12Merge branch 'develop' into issue/1354Mark Felder
2020-01-12Merge branch 'issue/1487' into 'develop'feld
[#1487] fixed clear HTML entities after scrub html and truncate See merge request pleroma/pleroma!2090
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-11docs: API: update Mastodon API linkAlibek Omarov
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-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-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-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-22update testMaksim Pechnikov
2019-12-22Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.exMaksim
2019-12-22Apply suggestion to ↵Maksim
lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
2019-12-21moved remote follow in separate controllerMaksim Pechnikov
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-20fixed remote followMaksim Pechnikov
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-19Instead allow a dedicated benchmark configMark Felder
2019-12-19Merge branch 'develop' into config/benchmarkMark Felder
2019-12-19Fix all countMaxim Filippov
2019-12-19Expose issue via failing testMaxim Filippov
2019-12-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
oauth-scopes-tweaks-and-tests
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-28 02:15:53 +0000