lain
bd77243981
Merge branch 'userfeed-fe-fallback' into 'develop'
...
UserController: fall back to frontend when user isn't found
Closes #2730
See merge request pleroma/pleroma!3515
2021-11-15 10:48:56 +00:00
lain
d058e1c978
Merge branch 'fix-releases' into 'develop'
...
CI: Conservatively update release images so they keep building.
See merge request pleroma/pleroma!3534
2021-11-14 20:35:10 +00:00
Lain Soykaf
5c7aa4a1e9
CI: Conservatively update release images so they keep building.
2021-11-14 20:37:32 +01:00
lain
0f8b10ff5a
Merge branch 'bugfix/inbox-misleading-warning' into 'develop'
...
activity_pub_controller: Fix misleading debug warning in post_inbox_fallback
See merge request pleroma/pleroma!3531
2021-11-14 16:14:09 +00:00
lain
eb0f7620f2
Merge branch 'update-crypt' into 'develop'
...
Mix: Update crypt to fix musl builds.
See merge request pleroma/pleroma!3533
2021-11-14 16:00:01 +00:00
Lain Soykaf
7dcc73f294
Mix: Update crypt to fix musl builds.
2021-11-14 16:04:08 +01:00
Lain Soykaf
871936b3ca
MediaProxyCacheControllerTest: Fix unstable tests.
...
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-14 11:45:38 +01:00
Lain Soykaf
2dea4a8c04
StealEmojiPolicyTest: Make mocks explicit.
2021-11-14 11:44:24 +01:00
Lain Soykaf
26450a0be3
Mix: Upgrade mogrify library
...
The old library would modify a file on reading it, the new one
doesn't have this issue.
2021-11-14 11:43:39 +01:00
Haelwenn (lanodan) Monnier
23e91ec8dd
activity_pub_controller: Fix misleading debug warning in post_inbox_fallback
2021-11-10 01:11:35 +01:00
Haelwenn (lanodan) Monnier
e4ad4f0bd6
mix: Update http_signatures to 0.1.1
2021-11-10 00:53:32 +01:00
sadposter
eb1c7d75f4
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-10-16 14:08:04 +01:00
Haelwenn
6b5c2d5f86
Merge branch 'refactor/group_validator_fields' into 'develop'
...
object_validators: Group common fields in CommonValidations
See merge request pleroma/pleroma!3384
2021-10-10 08:57:11 +00:00
Haelwenn (lanodan) Monnier
23161526d4
object_validators: Group common fields in CommonValidations
...
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-10 02:50:06 +02:00
feld
d8d819ddc7
Merge branch 'typo' into 'develop'
...
Fix typo
See merge request pleroma/pleroma!3528
2021-10-07 20:02:41 +00:00
Mark Felder
3af7db9fd7
Fix typo
2021-10-06 10:49:25 -05:00
Haelwenn
fee2260633
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3513
2021-10-06 06:26:55 +00:00
Ryo Ueno
5f2aefee1b
Translated using Weblate (Japanese)
...
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-06 06:12:17 +00:00
Ryo Ueno
84a7eb5597
Added translation using Weblate (Japanese)
2021-10-06 06:12:17 +00:00
Hồ Nhất Duy
a84aa10f70
Translated using Weblate (Vietnamese)
...
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-06 06:12:17 +00:00
Hồ Nhất Duy
3647c8e45b
Added translation using Weblate (Vietnamese)
2021-10-06 06:12:17 +00:00
@liimee
a3909f30b6
Translated using Weblate (Indonesian)
...
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-06 06:12:17 +00:00
@liimee
f0d0d4f6e4
Translated using Weblate (Indonesian)
...
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-06 06:12:17 +00:00
@liimee
f2806adeed
Translated using Weblate (Indonesian)
...
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-06 06:12:17 +00:00
@liimee
4a15fd8a0a
Translated using Weblate (Indonesian)
...
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-06 06:12:17 +00:00
@liimee
bea8a204a9
Translated using Weblate (Indonesian)
...
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-06 06:12:17 +00:00
@liimee
e00fe5b616
Translated using Weblate (Indonesian)
...
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-06 06:12:17 +00:00
@liimee
477d839444
Added translation using Weblate (Indonesian)
2021-10-06 06:12:17 +00:00
marcin mikołajczak
8467065aba
Translated using Weblate (Polish)
...
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-06 06:12:17 +00:00
Haelwenn
390ceb9f94
Merge branch 'ci/bump-elixir-lint' into 'develop'
...
CI: Bump lint stage to elixir-1.12
See merge request pleroma/pleroma!3488
2021-10-06 06:12:08 +00:00
Haelwenn (lanodan) Monnier
a17910a6c6
CI: Bump lint stage to elixir-1.12
...
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
2021-10-06 08:11:05 +02:00
Haelwenn
bdaa7e5394
Merge branch 'bugfix/crypt-pragma' into 'develop'
...
mix: Update crypt to fix #pragma warning
Closes #2710
See merge request pleroma/pleroma!3527
2021-10-06 05:58:52 +00:00
Haelwenn
92a8ff59aa
Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'
...
Allow users to remove their emails if instance does not need email to register
See merge request pleroma/pleroma!3522
2021-10-06 05:44:44 +00:00
Haelwenn
d2d462748c
Merge branch 'partev-develop-patch-72837' into 'develop'
...
fix a typo "Optionnal" -> "Optional"
See merge request pleroma/pleroma!3525
2021-10-06 05:41:06 +00:00
Haelwenn (lanodan) Monnier
3b20eddcf8
mix: Update crypt to fix #pragma warning
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2710
2021-10-06 07:40:02 +02:00
Haelwenn
d86b10a5e3
Merge branch 'dockerfix' into 'develop'
...
Docker fix
See merge request pleroma/pleroma!3526
2021-09-21 22:04:59 +00:00
Mark Felder
36df37e056
Update to newer buildx as current one can't be downloaded due to some Github error
2021-09-20 16:58:25 -05:00
sadposter
bd9c9136f9
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-09-13 16:14:58 +01:00
sadposter
1aab9b94b1
fix config
2021-09-13 16:13:42 +01:00
partev
ad5da6ae68
fix a typo "Optionnal" -> "Optional"
2021-09-12 15:31:49 +00:00
marcin mikołajczak
555d7d57c9
Add "exposable_reactions" to features, if showing reactions
2021-09-09 18:35:45 +00:00
Haelwenn
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
2021-09-07 16:41:53 +00:00
sadposter
c31e491e99
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-09-07 10:00:31 +01:00
Tusooa Zhu
198250dcef
Allow users to remove their emails if instance does not need email to register
2021-09-05 21:27:02 -04:00
Haelwenn
6b1282a829
Merge branch 'small-cleanup' into 'develop'
...
Remove unused Logger
See merge request pleroma/pleroma!3521
2021-09-01 21:52:56 +00:00
Mark Felder
181282fb2e
Remove unused Logger
2021-09-01 14:56:48 -05:00
sadposter
b202cf15d6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-08-30 22:04:42 +01:00
Haelwenn
2e695dbe3b
Merge branch 'chores/2.4.1-develop' into 'develop'
...
Mergeback: 2.4.1
Closes #2758
See merge request pleroma/pleroma!3520
2021-08-29 18:51:50 +00:00
Haelwenn
0b2119d4a7
Merge branch 'release/2.4.1' into 'stable'
...
Release: 2.4.1
See merge request pleroma/pleroma!3501
2021-08-29 18:48:53 +00:00
Sean King
3117c60997
Make suggested change for create_response
2021-08-29 07:25:54 -06:00