mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-11-13 12:31:13 +00:00
Code Issues Projects Releases Wiki Activity
16608 commits 259 branches 58 tags 358 MiB
Commit graph

16608 commits

This branch
This branch
All branches
Author SHA1 Message Date
marcin mikołajczak
1e8b79956e Merge branch 'docs-fix' into 'develop' 
Correct response in AdminAPI docs

See merge request pleroma/pleroma!4240
 2024-08-28 22:04:18 +00:00
marcin mikołajczak
3419e2cbdd Correct response in AdminAPI docs 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-28 18:28:22 +02:00
tusooa
58f646bcda Merge branch 'weblate' into 'develop' 
Translations update from Pleroma Weblate

See merge request pleroma/pleroma!4200
 2024-08-23 01:19:22 +00:00
Eric Zhang
16c6942df9 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 28.1% (274 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
9e3fa89243 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Pleroma/Pleroma Backend (domain default)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-default/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
7b979ac09d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (50 of 50 strings)

Translation: Pleroma/Pleroma Backend (domain oauth_scopes)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-oauth_scopes/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
914fdc508d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 19.8% (193 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
030be71307 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (100 of 100 strings)

Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-errors/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
73c6d7eaeb Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Pleroma/Pleroma Backend (domain default)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-default/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
6ba1b79259 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (47 of 47 strings)

Translation: Pleroma/Pleroma Backend (domain posix_errors)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-posix_errors/zh_Hans/
 2024-08-22 18:10:59 +00:00
Yating Zhan
1902323e97 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 19.8% (193 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
743c4f2f5f Translated using Weblate (Chinese (Simplified)) 
Currently translated at 19.8% (193 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
99ace19ca9 Added translation using Weblate (Chinese (Simplified)) 2024-08-22 18:10:59 +00:00
feld
0f3920f791 Merge branch 'fix-imports' into 'develop' 
Refactor Oban jobs for imports

See merge request pleroma/pleroma!4234
 2024-08-22 18:10:47 +00:00
Mark Felder
39108c5f12 Remove unnecessary re-fetch of the actor 2024-08-22 13:43:01 -04:00
Mark Felder
a9aa810d3d Change imports to generate an Oban job per each task 2024-08-22 13:24:07 -04:00
Mark Felder
649e51b581 Fix Oban jobs for imports 2024-08-22 11:35:55 -04:00
feld
08a444f6c3 Merge branch 'reachability' into 'develop' 
Fix reachability based on results of publishing attempts

See merge request pleroma/pleroma!4231
 2024-08-19 16:49:08 +00:00
feld
12d682c62f Merge branch 'remote-fetcher-fixes' into 'develop' 
Improve Remote Object Fetcher error handling, Oban

See merge request pleroma/pleroma!4230
 2024-08-19 16:48:25 +00:00
Mark Felder
1b8141b506 Address case where instance reachability status couldn't be updated 2024-08-19 11:12:28 -04:00
Mark Felder
55cc1ba50e Fix test cases for validating instance reachability based on results of publishing attempts 
Now that we store the unreachable_since in the Oban job the value is no longer a %NaiveDateTime{} so the code was wrong
 2024-08-19 11:12:25 -04:00
feld
2f5a1db56e Merge branch 'mogrify' into 'develop' 
Update mogrify

See merge request pleroma/pleroma!4225
 2024-08-18 01:01:31 +00:00
Mark Felder
089fa4d146 Improve Remote Object Fetcher error handling, Oban 2024-08-17 20:42:33 -04:00
Mark Felder
190a505ad3 Merge remote-tracking branch 'origin/develop' into mogrify 2024-08-17 17:57:27 -04:00
feld
ee26d85578 Merge branch 'bump-oban' into 'develop' 
Update Oban to 2.18

See merge request pleroma/pleroma!4228
 2024-08-17 21:35:20 +00:00
Mark Felder
7537c22b22 Update Oban to 2.18 2024-08-17 15:41:53 -04:00
Mark Felder
e1333c4fa4 Update mogrify 
Sent a pull request upstream to expand the version range depended on my blurhash

https://github.com/rinpatch/blurhash/pull/1
 2024-08-16 10:10:01 -04:00
feld
fcf9ad5573 Merge branch 'bugfix-truncate-remote-user-fields' into 'develop' 
User: truncate remote user fields instead of rejecting

See merge request pleroma/pleroma!4220
 2024-08-16 00:37:10 +00:00
feld
c91fc03e61 Merge branch 'norifications-marker' into 'develop' 
Fix 'Setting a marker should mark notifications as read'

Closes #2769

See merge request pleroma/pleroma!4223
 2024-08-16 00:36:31 +00:00
feld
3119ed3648 Merge branch 'ci-git-fetch' into 'develop' 
CI: GIT_STRATEGY: fetch

See merge request pleroma/pleroma!4224
 2024-08-16 00:34:15 +00:00
Haelwenn (lanodan) Monnier
b0e3a86316
CI: GIT_STRATEGY: fetch 
Seems to avoid fetching all the branches which was preventing shallow cloning from being actually useful.
 2024-08-15 01:49:31 +02:00
marcin mikołajczak
8cd8cea3fb Fix 'Setting a marker should mark notifications as read' 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-14 19:28:11 +02:00
Haelwenn (lanodan) Monnier
3b1e6ac8f0
User: truncate remote user fields instead of rejecting 2024-08-14 18:09:13 +02:00
feld
5174c29d4c Merge branch 'fix-random-test-errors' into 'develop' 
Fix random test failures, revert auto-retry failed tests

See merge request pleroma/pleroma!4221
 2024-08-13 20:16:09 +00:00
Mark Felder
b281ad06de Revert "Custom mix task to retry failed tests once in CI pipeline" 
This reverts commit ed2976b237.
 2024-08-13 15:49:04 -04:00
Mark Felder
648e94b369 Fix the uploads migration mix task test which leaked a change to the configured Uploader 2024-08-13 15:28:31 -04:00
feld
ccf476a4c8 Merge branch 'mrf-cleanup' into 'develop' 
MRF cleanup

See merge request pleroma/pleroma!4219
 2024-08-13 18:52:43 +00:00
Mark Felder
2ba5ad8eb5 MRF cleanup 
MRFs written over time have been inconsistent with the terminology of what is being processed. MRFs work on Activities, but generally we always named the assignments "message" or "object" which is really confusing when trying to debug or write tests.
 2024-08-13 14:22:41 -04:00
feld
7388c4b5ca Merge branch 'mrf-tests' into 'develop' 
MRF.FODirectReply: use Visibility module to verify the scope

See merge request pleroma/pleroma!4218
 2024-08-13 13:59:25 +00:00
Mark Felder
b0c64945c2 MRF.FODirectReply: use Visibility module to verify the scope 2024-08-12 20:18:02 -04:00
Mark Felder
8c978727c2 MRF.QuietReply: add test for replies to unlisted posts 2024-08-12 20:10:09 -04:00
feld
4e7928c985 Merge branch 'followers-only-reply-direct-mrf' into 'develop' 
MRF.FODirectReply

See merge request pleroma/pleroma!4091
 2024-08-12 21:46:45 +00:00
feld
fe2ed3fbc1 Merge branch 'user-factory' into 'develop' 
User Factory: include the nickname in the generated URLs

See merge request pleroma/pleroma!4214
 2024-08-12 21:38:30 +00:00
feld
f87aa8b83c Merge branch 'deprecate-subscribe' into 'develop' 
Mark `/api/v1/pleroma/accounts/:id/subscribe`/`unsubscribe` as deprecated

See merge request pleroma/pleroma!4216
 2024-08-12 21:27:12 +00:00
Mark Felder
c0ca7a4eca User Factory: include the nickname in the generated URLs 2024-08-12 17:12:39 -04:00
Mark Felder
488c4b8b98 MRF.FODirectReply 
Force replies to followers-only posts to always be direct
 2024-08-12 17:06:29 -04:00
feld
c29441f30d Merge branch 'mrf-quietreply' into 'develop' 
MRF.QuietReply

See merge request pleroma/pleroma!4213
 2024-08-12 20:25:19 +00:00
Mark Felder
471f5c81fd Add module documentation 2024-08-12 16:07:45 -04:00
feld
aa4f5428d3 Merge branch 'identity-proofs' into 'develop' 
Remove stub for /api/v1/accounts/:id/identity_proofs (deprecated by Mastodon 3.5.0)

See merge request pleroma/pleroma!4215
 2024-08-12 19:53:32 +00:00
feld
d3fbbfb39a Merge branch 'swoosh-mailgun' into 'develop' 
Fix Swoosh Mailgun support

See merge request pleroma/pleroma!4217
 2024-08-12 19:52:37 +00:00