summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-18StealEmojiPolicy: fix String rejected_shortcodesHélène
* rejected_shortcodes is defined as a list of strings in the configuration description. As such, database-based configuration was led to handle those settings as strings, and not as the actually expected type, Regex. * This caused each message passing through this MRF, if a rejected shortcode was set and the emoji did not exist already on the instance, to fail federating, as an exception was raised, swiftly caught and mostly silenced. * This commit fixes the issue by introducing new behavior: strings are now handled as perfect matches for an emoji shortcode (meaning that if the emoji-to-be-pulled's shortcode is in the blacklist, it will be rejected), while still supporting Regex types as before.
2022-05-08Merge branch 'improve_anti_followbot_policy' into 'develop'Haelwenn
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy Closes #2561 See merge request pleroma/pleroma!3498
2022-05-08Also use actor_type to determine if an account is a bot in antiFollowbotPolicyIlja
2022-05-06Merge branch 'security/2.4.3-develop' into 'develop'Haelwenn
Merge back 2.4.3 See merge request pleroma/pleroma!3663
2022-05-06mix: Bump to 2.4.52 for 2.4.3 mergebackHaelwenn (lanodan) Monnier
2022-05-06Skip cache when /objects or /activities is authenticatedTusooa Zhu
Ref: fix-local-public
2022-05-06Allow to skip cache in Cache plugTusooa Zhu
Ref: fix-local-public
2022-05-06update sweet_xml [Security]Ilja
2022-04-18Merge branch 'from/upstream-develop/tusooa/fix-en-fallback' into 'develop'Haelwenn
Fix incorrect fallback when English is set to first language See merge request pleroma/pleroma!3656
2022-04-17Fix incorrect fallback when English is set to first languageTusooa Zhu
2022-04-05Merge branch 'fix_eratic_test_for_report_notes' into 'develop'Haelwenn
Fix eratic test for POST /api/pleroma/admin/reports/:id/notes See merge request pleroma/pleroma!3653
2022-04-05Fix eratic test for POST /api/pleroma/admin/reports/:id/notesIlja
It retrieved two ReportNotes and then checked one of them. But the order isn't guaranteed, while the test tested on the content of the first ReportNote. I made the test on the content more generic
2022-03-20Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop'Haelwenn
Translate backend-rendered pages See merge request pleroma/pleroma!3634
2022-03-20Merge branch 'caddyfile-v2' into 'develop'Haelwenn
Update Caddyfile to Caddy v2 Closes #2764 See merge request pleroma/pleroma!3641
2022-03-20Merge branch 'delete_report_notifs_when_demoting_from_superuser' into 'develop'Haelwenn
Delete report notifs when demoting from superuser Closes #2840 See merge request pleroma/pleroma!3642
2022-03-17Merge branch 'bugfix/mix-dotgit' into 'develop'Haelwenn
mix: Check `.git` presence See merge request pleroma/pleroma!3638
2022-03-07After code reviewIlja
Use patern matching to see if someone was superuser before
2022-03-06Merge branch 'fix_test_get_user_apps' into 'develop'Haelwenn
Fix test get_user_apps/1 See merge request pleroma/pleroma!3636
2022-03-06Merge branch 'copyright-bump-2022' into 'develop'Haelwenn
Copyright bump for 2022 See merge request pleroma/pleroma!3593
2022-03-06Support fallbacking to other languagesTusooa Zhu
2022-03-06Delete report notifs when demoting from superuserIlja
When someone isn't a superuser any more, they shouldn't see the reporsts any more either. Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.
2022-03-06Update Caddyfile to Caddy v2sleepycrow
2022-03-03LintTusooa Zhu
2022-03-03Support multiple locales from userLanguage cookieTusooa Zhu
2022-03-03Support multiple locales formallyTusooa Zhu
elixir gettext current does not fully support fallback to another language [0]. But it might in the future. We adapt it so that all languages in Accept-Language headers are received by Pleroma.Web.Gettext. User.languages is now a comma-separated list. [0]: https://github.com/elixir-gettext/gettext/issues/303
2022-03-02Make lint happyTusooa Zhu
2022-03-02Add test for fallbacking to a general languageTusooa Zhu
2022-03-02Fallback to a variant if the language in general is not supportedTusooa Zhu
For an example, here, zh is not supported, but zh_Hans and zh_Hant are. If the user asks for zh, we should choose a variant for them instead of fallbacking to default. Some browsers (e.g. Firefox) does not allow users to customize their language codes. For example, there is no zh-Hans, but only zh, zh-CN, zh-TW, zh-HK, etc. This provides a workaround for those users suffering from bad design decisions.
2022-03-02Add changelogTusooa Zhu
2022-03-02Document API additionTusooa Zhu
2022-03-02Allow user to register with custom languageTusooa Zhu
2022-03-02Allow update_credentials to update User.languageTusooa Zhu
2022-03-01Send emails i18n'd using backend-stored user languageTusooa Zhu
2022-03-01Make all emails translatableTusooa Zhu
2022-03-01Fix digest testTusooa Zhu
2022-03-01Make mail and mailer translatableTusooa Zhu
2022-03-01Make static fe translatableTusooa Zhu
2022-03-01Merge branch 'revert-ee05abe0' into 'develop'feld
Revert "Merge branch 'revert/notice-routes' into 'develop'" See merge request pleroma/pleroma!3639
2022-03-01Revert "Merge branch 'revert/notice-routes' into 'develop'"feld
This reverts merge request !3576
2022-02-28Fix testsTusooa Zhu
2022-02-28Make mfa pages translatableTusooa Zhu
2022-02-28Make oauth pages translatableTusooa Zhu
2022-02-28Use proper lang attributes in htmlsTusooa Zhu
2022-02-28Make tag feed translatableTusooa Zhu
2022-02-28Make password reset pages translatableTusooa Zhu
2022-02-26Merge branch 'revert/notice-routes' into 'develop'HJ
Revert notice compatibility routes merge request See merge request pleroma/pleroma!3576
2022-02-25Copyright bump for 2022Sean King
2022-02-25mix: Check .git presenceHaelwenn (lanodan) Monnier
2022-02-22Fix test get_user_apps/1Ilja
For some reason I had a test who suddenly failed, mix test test/pleroma/web/o_auth/app_test.exs:54. A user has a list of applications and this test adds them and then sees if the list it gets back is the same as the apps it added. When I ran mix test a day before I didn't have this problem and when I pushed code today in a different MR, the pipeline succeeded (see https://git.pleroma.social/ilja/pleroma/-/jobs/205827), yet locally it failed. So it seems the test can sometimes succeed and sometimes fail, which makes it untrustworthy. The failure I see is because the returned list is in reverse order. I assume that's not per sé wrong. You just want to know if the apps you added are actually there. I fixed the test by first ordering the lists before comparing. AFAICT (and as far as that's relevant) the test got introduced in commit cb2a072e6252b7c3f6473f7cfd1af5c0ec732d7b
2022-02-21Make lint happyTusooa Zhu
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 05:20:50 +0000