aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-11Remove MDII uploaderHakaba Hitoyo
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-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
2019-12-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
oauth-scopes-tweaks-and-tests
2019-12-19[#2068] Introduced proper OAuth tokens usage to controller tests.Ivan Tashkinov
2019-12-19Do not crash when remote user follower and following counters are hiddenEgor Kislitsyn
2019-12-18Stats: return status counts by scopeMaxim Filippov
2019-12-17Merge branch 'feature/add-event-support' into 'develop'rinpatch
Add ActivityPub Object Event type support See merge request pleroma/pleroma!2075
2019-12-17Merge branch 'ci/rum-testing-no-recompilation' into 'develop'rinpatch
CI: Add a cache policy for test jobs and fix rum tests recompiling everything See merge request pleroma/pleroma!2074
2019-12-17CI: Add a cache policy for test jobs and fix rum tests recompilingrinpatch
everything
2019-12-17Add ActivityPub Object Event type supportThomas Citharel
Adds Event support in the same way Video objects are handled, with the name of the object as message header. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17Merge branch 'hide-followers-count' into 'develop'Haelwenn
Hide follower counter when hiding is activated Closes #1450 See merge request pleroma/pleroma!2072
2019-12-17Hide follower counter when hiding is activatedEgor Kislitsyn
2019-12-16Merge branch 'fix/remove-useless-sleep' into 'develop'lain
Remove useless sleeping/reduce it See merge request pleroma/pleroma!2069
2019-12-16Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-16Merge branch 'kocaptcha-default-endpoint' into 'develop'rinpatch
Add default endpoint to Pleroma.Captcha.Kocaptcha See merge request pleroma/pleroma!2070
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-16formattingrinpatch
2019-12-16tests: significantly reduce streamer timeoutrinpatch
there is no reason IPC between two processes on the same node should take 4 seconds
2019-12-16tests: remove a useless sleep in rate limiter testsrinpatch
It was used to check that authenticated and unauthenticated users have different limits. Instead of sleeping a super low limit for unauthenticated users was set, preventing them from doing 5 requests in the first place.
2019-12-16tests: remove a useless 1 second sleeprinpatch
there is no need to wait for the task to finish, it will be deleted when the transaction is aborted anyway.
2019-12-16tests: remove a useless 3 second sleeprinpatch
the ids favs use are accurate down to a microsecond, there is no need for it
2019-12-16tests: Replace 2 second sleep with offseting updated_atrinpatch
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵Ivan Tashkinov
controller tests modification: OAuth scopes usage.
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 02:35:19 +0000