summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-03otp_version refactorAlexander Strizhakov
2020-03-03debug logs on pleroma restartAlexander Strizhakov
2020-03-03Merge branch 'develop' into gunAlexander Strizhakov
2020-03-03debian_based_*.md: Use erlang-nox metapackageHaelwenn (lanodan) Monnier
2020-03-03Merge remote-tracking branch 'origin/develop' into global-status-expirationEgor Kislitsyn
2020-03-03Merge remote-tracking branch 'origin/develop' into fix/signup-without-emailEgor Kislitsyn
2020-03-02[#1560] Added tests for non-federating instance bahaviour to ↵Ivan Tashkinov
OStatusControllerTest.
2020-03-02Clarify in docs how to control connections_pool for Gun.Mark Felder
It could easily be confused with the Hackney settings.
2020-03-02Move Tesla repo to our GitLabMark Felder
2020-03-02[#1560] Added tests for non-federating instance bahaviour to ↵Ivan Tashkinov
ActivityPubControllerTest.
2020-03-02Merge branch 'prepared-statements-settings' into 'develop'lain
Prepared statements settings See merge request pleroma/pleroma!2238
2020-03-02Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions
2020-03-02Exclude reblogs from `GET /api/pleroma/admin/statuses` by defaulteugenijm
2020-03-02Merge branch 'develop' into fix/signup-without-emailEgor Kislitsyn
2020-03-02Merge branch 'docs_cheatsheet_fix' into 'develop'rinpatch
fix for :fetch_initial_posts See merge request pleroma/pleroma!2266
2020-03-02fix for :fetch_initial_postsilja
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
2020-03-02Merge branch 'feature/1482-activity_pub_transactions' into 'develop'Haelwenn
ActivityPub actions & side-effects in transaction Closes #1482 See merge request pleroma/pleroma!2089
2020-03-02stop connections manuallyAlexander Strizhakov
2020-03-02relay list shows hosts without accepted followAlexander Strizhakov
2020-03-02returning repo parametersAlexander Strizhakov
2020-03-02Merge branch 'chores/bump-copyright' into 'develop'Haelwenn
Bump copyright See merge request pleroma/pleroma!2265
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-03-02Bump copyright years of files changed after 2019-01-01Haelwenn (lanodan) Monnier
Done via the following command: git diff 1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2020-03-02pleroma_api.md: direct_conversation_id vs. conversation_idHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-01Merge branch 'docs_cheatsheet' into 'develop'rinpatch
DOCS Add warning for fetch_initial_posts + more explicit distinction between OTP and from source See merge request pleroma/pleroma!2262
2020-03-01Add warning to the fetch_initial_posts setting. Now we sometimes have people ↵Ilja
who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users) I also made a more explicit distinction between OTP and from source installs in the general explanation
2020-03-01Merge branch 'develop' into gunAlexander Strizhakov
2020-03-01wait in mix task while pleroma is rebootedAlexander Strizhakov
2020-03-01spec fixAlexander Strizhakov
2020-03-01fix for compilingAlexander Strizhakov
2020-03-01ActivityPub actions & side-effects in transactionAlexander Strizhakov
2020-02-29Fix static FE plug to handle missing Accept header.Phil Hagelberg
2020-02-29Merge branch 'fix/easy-timeline-dos' into 'develop'rinpatch
Cap the number of requested statuses in timelines to 40 and rate limit them See merge request pleroma/pleroma!2253
2020-03-01timeline controller: add a TODO for replacing copypaste with a macrorinpatch
2020-03-01changelog: entries for timeline DoS fixesrinpatch
2020-03-01timeline controller: rate limit timelines to 3 requests per 500ms per ↵rinpatch
timeline per ip/user
2020-03-01rate limiter: Fix a race conditionrinpatch
When multiple requests are processed by rate limiter plug at the same time and the bucket is not yet initialized, both would try to initialize the bucket resulting in an internal server error.
2020-03-01pagination: limit the number of elements returned at one time to 40rinpatch
2020-02-29Merge branch 'rate-limiter-runtime-settings' into 'develop'rinpatch
RateLimiter improvements: runtime configurability, no default limits in tests See merge request pleroma/pleroma!2250
2020-02-29[#2250] Tiny refactoring per merge request review.Ivan Tashkinov
2020-02-29Merge branch 'chore/update-cachex' into 'develop'rinpatch
deps: update cachex to 3.2.0 See merge request pleroma/pleroma!2259
2020-02-29deps: update cachex to 3.2.0rinpatch
2020-02-29Merge branch 'mastofe/bundle-2020-01-20' into 'develop'rinpatch
MastoFE: Bundle 2020-01-20 See merge request pleroma/pleroma!2257
2020-02-29Merge branch 'descriptions-changes' into 'develop'Haelwenn
Adding streamer group & Oban crontab child to descriptions.exs Closes #1592 See merge request pleroma/pleroma!2258
2020-02-29Merge branch 'develop' into gunAlexander Strizhakov
2020-02-29streamer group & Oban crontab childAlexander Strizhakov
2020-02-29MastoFE: Bundle 2020-01-20Haelwenn (lanodan) Monnier
2020-02-29auth_controller.ex: Add admin scope to MastoFEHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
2020-02-28Merge branch 'update/pleroma-fe-20200228' into 'develop'feld
Update PleromaFE bundle for the 2.0 release See merge request pleroma/pleroma!2255
2020-02-28Merge branch 'develop' into update/pleroma-fe-20200228Mark Felder
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 11:13:24 +0000