summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-09-03ci-base: Document building and pushing a new imageHaelwenn (lanodan) Monnier
2022-09-02Bump minimum Elixir version to 1.10Haelwenn (lanodan) Monnier
With the release of Elixir 1.14, Elixir 1.9 is now end-of-life. Elixir 1.10 Release Notes: https://github.com/elixir-lang/elixir/releases/tag/v1.10.0
2022-09-02Merge branch 'rewrite/integration-test-websocket-client' into 'develop'Haelwenn
Rewrite integration-test websocket client with Mint.WebSocket, closes #2812 Closes #2812 See merge request pleroma/pleroma!3649
2022-08-27Merge branch 'fix/fedi-fe-build-url' into 'develop'tusooa
Fix fedi-fe build URL, addresses #2920 See merge request pleroma/pleroma!3736
2022-08-27Merge branch 'feature/emoji-15-support' into 'develop'tusooa
emoji-test: update to latest 15.0 draft See merge request pleroma/pleroma!3726
2022-08-27Merge branch 'from/upstream-develop/tusooa/static-page-styles' into 'develop'tusooa
Improve static page style See merge request pleroma/pleroma!3729
2022-08-25Merge branch 'fix_erratic_tests' into 'develop'tusooa
Fix flaky rate_limiter_test.exs test "it restricts based on config values" See merge request pleroma/pleroma!3688
2022-08-25Merge branch 'fix_flaky_transfer_task_test.exs' into 'develop'tusooa
Fix flaky/erratic test/pleroma/config/transfer_task_test.exs See merge request pleroma/pleroma!3703
2022-08-25Merge branch 'fix_erratic_participation_test' into 'develop'tusooa
fix flaky participation_test.exs See merge request pleroma/pleroma!3689
2022-08-25fix flaky participation_test.exsIlja
2022-08-24Fix fedi-fe build URLSean King
2022-08-24Merge branch 'fix_flaky_filter_controller_test.exs_200' into 'develop'tusooa
fix flaky test filter_controller_test.exs:200 See merge request pleroma/pleroma!3699
2022-08-24fix flaky test filter_controller_test.exs:200Ilja
2022-08-24Merge branch 'fix_flaky_test_user_relationship_test.exs_81' into 'develop'tusooa
fix flaky test_user_relationship_test.exs:81 See merge request pleroma/pleroma!3697
2022-08-24fix flaky test_user_relationship_test.exs:81Ilja
2022-08-24Merge branch 'fix/oauth-token-user-caching' into 'develop'tusooa
OAuthPlug: use user cache instead of joining See merge request pleroma/pleroma!3734
2022-08-24Merge branch 'add/glitch-lily-fe' into 'develop'tusooa
Add glitch-lily as an installable frontend See merge request pleroma/pleroma!3727
2022-08-24OAuthPlug: use user cache instead of joiningHélène
As this plug is called on every request, this should reduce load on the database by not requiring to select on the users table every single time, and to instead use the by-ID user cache whenever possible.
2022-08-20Add margin to forms and make inputs fill whole widthTusooa Zhu
2022-08-21Merge branch 'from/upstream-develop/tusooa/alpine-bump' into 'develop'tusooa
Use latest alpine version for docker image See merge request pleroma/pleroma!3719
2022-08-19Add glitch-lily as an installable frontendSean King
2022-08-19Merge branch 'varnish-fix-changelog' into 'develop'feld
Document the changes for Varnish 7.0+ compatibility and RFC compliance See merge request pleroma/pleroma!3723
2022-08-20emoji-test: update to latest 15.0 draftHélène
2022-08-12Document the changes for Varnish 7.0+ compatibility and RFC complianceMark Felder
2022-08-12Merge branch 'from/upstream-develop/tusooa/2912-receiver-reject-mrf' into ↵Haelwenn
'develop' Treat MRF rejects as success in Oban worker Closes #2912 See merge request pleroma/pleroma!3720
2022-08-12Merge branch 'fix_flaky_tests_where_we_sometimes_loose_db_connections' into ↵Haelwenn
'develop' Fix flaky tests with DB connections; Allow higher amount of restarts for Pleroma.Repo during testing See merge request pleroma/pleroma!3696
2022-08-12Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'Haelwenn
Synchronized settings for apps (frontends) See merge request pleroma/pleroma!3698
2022-08-12Merge branch 'from/upstream-develop/floatingghost/follow-state' into 'develop'Haelwenn
Backport: bugfix/follow-state Closes #2902 See merge request pleroma/pleroma!3718
2022-08-11Merge branch 'fix-varnish7-support' into 'develop'feld
Fix Varnish7 support See merge request pleroma/pleroma!3722
2022-08-10Fix the mocks to use uppercase as wellMark Felder
2022-08-10Update the recommended VCL configurationMark Felder
2022-08-10Fix Varnish 7 support by ensuring Media Preview Proxy fetches headers with a ↵Mark Felder
capitalized HEAD verb
2022-08-08Treat containment failure as cancel in ReceiverWorkerTusooa Zhu
2022-08-06Fix FederatorTestTusooa Zhu
2022-08-06Treat MRF rejects as success in Oban workerTusooa Zhu
2022-08-05Use latest alpine version for docker imageTusooa Zhu
2022-08-03bugfix/follow-state (#104)floatingghost
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/104
2022-08-02Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop'Haelwenn
local only fixes Closes #2871 See merge request pleroma/pleroma!3660
2022-08-02Merge branch 'from/upstream-develop/tusooa/backup-without-email' into 'develop'Haelwenn
Allow users to create backups without providing email address See merge request pleroma/pleroma!3665
2022-08-02Merge branch 'weblate' into 'develop'Haelwenn
Translations update from Pleroma Weblate See merge request pleroma/pleroma!3716
2022-07-31Translated using Weblate (Chinese (Simplified))Yating Zhan
Currently translated at 18.9% (189 of 998 strings) Translation: Pleroma/Pleroma Backend (domain config_descriptions) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-31Translated using Weblate (Chinese (Simplified))tusooa
Currently translated at 18.9% (189 of 998 strings) Translation: Pleroma/Pleroma Backend (domain config_descriptions) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-31Merge branch 'from/develop/tusooa/emit-move' into 'develop'Haelwenn
Implement moving account See merge request pleroma/pleroma!3524
2022-07-31Change test case wordingHaelwenn
2022-07-31Merge branch 'develop' into 'from/develop/tusooa/emit-move'tusooa
# Conflicts: # CHANGELOG.md # test/pleroma/user_test.exs
2022-07-31Merge branch 'mutes' into 'develop'Haelwenn
MastoAPI: Use `duration` param for mute expiration duration See merge request pleroma/pleroma!3715
2022-07-31Use `duration` param for mute expiration durationmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-28Merge branch 'fix/proper-emoji-qualification' into 'develop'Haelwenn
Emoji: implement full-qualifier using combinations See merge request pleroma/pleroma!3709
2022-07-28Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'Haelwenn
Make mutes and blocks behave the same as other lists Closes #2384 See merge request pleroma/pleroma!3693
2022-07-28Merge branch 'from/upstream-develop/tusooa/gettext-extract' into 'develop'Haelwenn
Extract translatable strings See merge request pleroma/pleroma!3712
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-08 16:16:28 +0000