summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-14Merge branch 'bugfix/inbox-misleading-warning' into 'develop'lain
activity_pub_controller: Fix misleading debug warning in post_inbox_fallback See merge request pleroma/pleroma!3531
2021-11-14Merge branch 'update-crypt' into 'develop'lain
Mix: Update crypt to fix musl builds. See merge request pleroma/pleroma!3533
2021-11-14Mix: Update crypt to fix musl builds.Lain Soykaf
2021-11-14MediaProxyCacheControllerTest: Fix unstable tests.Lain Soykaf
Cachex order isn't stable, so we can not depend on the order in tests. This adds some sorting to make the tests stable.
2021-11-14StealEmojiPolicyTest: Make mocks explicit.Lain Soykaf
2021-11-14Mix: Upgrade mogrify libraryLain Soykaf
The old library would modify a file on reading it, the new one doesn't have this issue.
2021-11-10activity_pub_controller: Fix misleading debug warning in post_inbox_fallbackHaelwenn (lanodan) Monnier
2021-11-10mix: Update http_signatures to 0.1.1Haelwenn (lanodan) Monnier
2021-10-10Merge branch 'refactor/group_validator_fields' into 'develop'Haelwenn
object_validators: Group common fields in CommonValidations See merge request pleroma/pleroma!3384
2021-10-10object_validators: Group common fields in CommonValidationsHaelwenn (lanodan) Monnier
Notes: - QuestionValidator didn't have a :name field but that seems like a mistake - `_fields` functions can't inherit others because of some Validators - bto/bcc fields were absent in activities, also seems like a mistake (Well IIRC we don't or barely support bto/bcc anyway)
2021-10-07Merge branch 'typo' into 'develop'feld
Fix typo See merge request pleroma/pleroma!3528
2021-10-06Fix typoMark Felder
2021-10-06Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
Translations update from Weblate See merge request pleroma/pleroma!3513
2021-10-06Translated using Weblate (Japanese)Ryo Ueno
Currently translated at 21.6% (23 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/ja/
2021-10-06Added translation using Weblate (Japanese)Ryo Ueno
2021-10-06Translated using Weblate (Vietnamese)Hồ Nhất Duy
Currently translated at 100.0% (106 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/vi/
2021-10-06Added translation using Weblate (Vietnamese)Hồ Nhất Duy
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 64.1% (68 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 61.3% (65 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 59.4% (63 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 55.6% (59 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 50.9% (54 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 4.7% (5 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Added translation using Weblate (Indonesian)@liimee
2021-10-06Translated using Weblate (Polish)marcin mikołajczak
Currently translated at 100.0% (104 of 104 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2021-10-06Merge branch 'ci/bump-elixir-lint' into 'develop'Haelwenn
CI: Bump lint stage to elixir-1.12 See merge request pleroma/pleroma!3488
2021-10-06CI: Bump lint stage to elixir-1.12Haelwenn (lanodan) Monnier
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
2021-10-06Merge branch 'bugfix/crypt-pragma' into 'develop'Haelwenn
mix: Update crypt to fix #pragma warning Closes #2710 See merge request pleroma/pleroma!3527
2021-10-06Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'Haelwenn
Allow users to remove their emails if instance does not need email to register See merge request pleroma/pleroma!3522
2021-10-06Merge branch 'partev-develop-patch-72837' into 'develop'Haelwenn
fix a typo "Optionnal" -> "Optional" See merge request pleroma/pleroma!3525
2021-10-06mix: Update crypt to fix #pragma warningHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2710
2021-09-21Merge branch 'dockerfix' into 'develop'Haelwenn
Docker fix See merge request pleroma/pleroma!3526
2021-09-20Update to newer buildx as current one can't be downloaded due to some Github ↵Mark Felder
error
2021-09-12fix a typo "Optionnal" -> "Optional"partev
2021-09-09Add "exposable_reactions" to features, if showing reactionsmarcin mikołajczak
2021-09-07Merge branch 'remove/mastofe' into 'develop'Haelwenn
Remove MastoFE from Pleroma, fixes #2625 Closes #2625 See merge request pleroma/pleroma!3392
2021-09-05Allow users to remove their emails if instance does not need email to registerTusooa Zhu
2021-09-01Merge branch 'small-cleanup' into 'develop'Haelwenn
Remove unused Logger See merge request pleroma/pleroma!3521
2021-09-01Remove unused LoggerMark Felder
2021-08-29Merge branch 'chores/2.4.1-develop' into 'develop'Haelwenn
Mergeback: 2.4.1 Closes #2758 See merge request pleroma/pleroma!3520
2021-08-29Merge branch 'release/2.4.1' into 'stable'Haelwenn
Release: 2.4.1 See merge request pleroma/pleroma!3501
2021-08-29Make suggested change for create_responseSean King
2021-08-29Fix aliases sortingSean King
2021-08-28Add unit test for Pleroma API app controllerSean King
2021-08-28Fix lintSean King
2021-08-28Move GET /api/v1/apps to GET /api/v1/pleroma/appsSean King
2021-08-28Require follow and read OAuth scopes for GET /api/v1/appsSean King
2021-08-28Merge branch 'release/2.4.1' into chores/2.4.1-developHaelwenn (lanodan) Monnier
2021-08-28Release 2.4.1Haelwenn (lanodan) Monnier
2021-08-28mix pleroma.database set_text_search_config now runs concurrently and infinitelysomeone
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3514
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-18 17:10:08 +0000