summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-06Remove EmojiPacks from AdminFE buildMark Felder
Once more, with feeling
2020-03-06Merge branch 'update/admin-fe-without-emojipack' into 'develop'lain
Remove emoji support from AdminFE See merge request pleroma/pleroma!2274
2020-03-06Remove emoji support from AdminFEMark Felder
2020-03-06Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions
2020-03-05pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4ddrinpatch
2020-03-05Merge branch 'stable' into release/2.0.0rinpatch
2020-03-05Merge branch 'stable' into release/2.0.0rinpatch
2020-03-05version bump changelog and mix versionrinpatch
2020-03-05changelog: sync with stablerinpatch
2020-03-05[#1560] Misc. improvements in ActivityPubController federation state ↵Ivan Tashkinov
restrictions.
2020-03-05Exclude private and direct statuses visible to the admin when using godmodeeugenijm
2020-03-05Merge branch 'proper_error_messages' into 'develop'lain
MastodonController: Return 404 errors correctly. See merge request pleroma/pleroma!2270
2020-03-05Admin API tests: Fix wrong test.lain
2020-03-05Merge branch 'fix/stats-on-startup' into 'develop'Haelwenn
Generate instance stats on startup Closes #1598 See merge request pleroma/pleroma!2271
2020-03-04Document the instance stats fixMark Felder
2020-03-04Generate instance stats on startupMark Felder
2020-03-04Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'feld
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default Closes #1596 See merge request pleroma/pleroma!2267
2020-03-04MastodonController: Return 404 errors correctly.lain
2020-03-04Merge branch 'fix/no-email-no-fail' into 'develop'lain
Do not fail when user has no email See merge request pleroma/pleroma!2249
2020-03-03Merge branch 'chore/update-copyrights' into 'develop'Haelwenn
Update Copyrights See merge request pleroma/pleroma!2269
2020-03-03Older copyright updatesMark Felder
2020-03-03Update CopyrightsMark Felder
2020-03-03[#1560] ActivityPubController federation state restrictions adjustments. ↵Ivan Tashkinov
Adjusted tests.
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-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-02relay list shows hosts without accepted followAlexander 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-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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 09:35:57 +0000