bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15449 commits 1 branch 0 tags 292 MiB
Commit graph

1208 commits

Author SHA1 Message Date
marcin mikołajczak
7ee63904ec Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-22 19:20:52 +01:00
weblate-extractor
b3d250a70a Extract translatable strings 2022-12-20 06:11:50 +00:00
weblate-extractor
cfca9544e8 Extract translatable strings 2022-12-16 16:59:26 +00:00
Lain Soykaf
63d00f8123 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps 2022-12-15 17:19:36 -05:00
Alex Gleason
9a091a8d85
Add events index 2022-12-07 18:01:42 -06:00
Xnuk Shuman
3e8f49be67 Added translation using Weblate (Korean) 2022-12-01 17:17:03 +00:00
marcin mikołajczak
1d011e6ed2 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-11-27 14:09:03 +01:00
Haelwenn (lanodan) Monnier
8f3e750530 scrubbers: Scrub img class attribute 
Closes: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3790
 2022-11-27 03:40:21 +01:00
Alex Gleason
6d4f99d9b3
Disable inline images 2022-11-26 16:21:15 -06:00
marcin mikołajczak
2e7a713e58 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-16 00:06:25 +01:00
marcin mikołajczak
b7879d58f3 Merge remote-tracking branch 'pleroma/develop' into HEAD 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-15 23:27:58 +01:00
Dmytro Poltavchenko
451c415fca Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (95 of 95 strings)

Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/uk/
 2022-11-12 22:13:38 +00:00
Dmytro Poltavchenko
1c97a86b8d Added translation using Weblate (Ukrainian) 2022-11-12 22:13:38 +00:00
Dmytro Poltavchenko
3979eaf14a Added translation using Weblate (Ukrainian) 2022-11-12 22:13:38 +00:00
Mark Felder
8a3b450397 Add migration to remove Quack from ConfigDB 2022-11-11 12:36:34 -05:00
marcin mikołajczak
8661703c16 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-09 17:08:18 +01:00
marcin mikołajczak
2c62043ef9 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-05 21:08:08 +01:00
Alex Gleason
39d7093ff5
Remove Shout feature 2022-11-03 13:29:52 -05:00
Mark Felder
7c64f705f6 Update to Phoenix 1.6 and chase dependencies 
Also bump minimum Elixir to 1.11
 2022-11-03 16:13:07 +00:00
Alex Gleason
f303a02e86
Let favicon be configurable 2022-10-27 13:15:15 -05:00
marcin mikołajczak
8221504ecb Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-10-12 21:52:36 +02:00
weblate-extractor
1ac9bd0b4c Extract translatable strings 2022-10-11 06:13:00 +00:00
Alex Gleason
035d9e71eb
Merge remote-tracking branch 'origin/develop' into merge-pleroma 2022-10-09 13:58:19 -05:00
marcin mikołajczak
4d9ecc2b9e Fix down() in AddUpdateToNotificationsEnum migration for Rebased 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-06 00:11:25 +02:00
marcin mikołajczak
0612c32c6e Add notifications for updates in events you joined 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-01 22:26:35 +02:00
marcin mikołajczak
58e0ca0d68 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-09-30 20:04:29 +02:00
Alex Gleason
f6afe649fe
GenerateUnsetUserKeys: only select necessary user fields 2022-09-28 17:58:25 -05:00
Alex Gleason
544be36c80
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-09-28 17:29:53 -05:00
marcin mikołajczak
c6fddd6e0a Add migration cooldown period 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-28 23:48:45 +02:00
marcin mikołajczak
f5fe5b4544 Add shortcuts and share_target to manifest.json 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-24 18:34:09 +02:00
marcin mikołajczak
3b498061ed Merge remote-tracking branch 'rebased/develop' into pleroma-events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-16 21:24:22 +02:00
Alex Gleason
f5e77a3eaa
soapbox-fe --> soapbox 2022-09-13 15:26:28 -05:00
weblate-extractor
3d32c92b37 Extract translatable strings 2022-09-06 16:45:08 +00:00
Haelwenn
346c130ddc Merge branch 'fix/user-private-key-generation' into 'develop' 
User: generate private keys on user creation

See merge request pleroma/pleroma!3737
 2022-09-05 15:38:15 +00:00
tusooa
f7c2073103 Merge branch 'bump/min-elixir-1.10' into 'develop' 
Bump minimum Elixir version to 1.10

See merge request pleroma/pleroma!3741
 2022-09-05 15:19:34 +00:00
marcin mikołajczak
d4eccd86b3 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 15:30:14 +02:00
Hélène
cfb1bc967f
Migrations: generate unset user keys 
User keys are now generated on user creation instead of "when needed",
to prevent race conditions in federation and a few other issues. This
migration will generate keys missing for local users.
 2022-09-05 03:51:35 +02:00
tusooa
20347898e2 Merge branch 'fix/federation-context-issues' into 'develop' 
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects

See merge request pleroma/pleroma!3717
 2022-09-04 18:43:36 +00:00
marcin mikołajczak
cdf454bfd2 Merge remote-tracking branch 'pleroma/develop' into HEAD 2022-09-03 17:04:02 +02:00
marcin mikołajczak
0312f6770c Merge branch 'develop' into 'edits' 
# Conflicts:
#   priv/static/schemas/litepub-0.1.jsonld
 2022-09-03 14:14:25 +00:00
Haelwenn
299255b9bb Merge branch 'from/upstream-develop/tusooa/assoc-object-id' into 'develop' 
Add function to calculate associated object id

Closes #2307

See merge request pleroma/pleroma!3692
 2022-09-03 02:50:40 +00:00
Haelwenn
e40c221c31 Merge branch 'from/upstream-develop/tusooa/edits' into 'develop' 
Editing

Closes #1429, #2859, and #2288

See merge request pleroma/pleroma!3678
 2022-09-03 02:16:42 +00:00
Haelwenn (lanodan) Monnier
21ab7369ca Bump minimum Elixir version to 1.10 
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-02 22:53:54 +02:00
Fristi
0d8c6b0488 Translated using Weblate (Dutch) 
Currently translated at 63.8% (30 of 47 strings)

Translation: Pleroma/Pleroma Backend (domain posix_errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-posix_errors/nl/
 2022-09-02 19:18:40 +00:00
Fristi
9af5da6666 Translated using Weblate (Dutch) 
Currently translated at 100.0% (83 of 83 strings)

Translation: Pleroma/Pleroma Backend (domain static_pages)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-static_pages/nl/
 2022-09-02 19:18:40 +00:00
Fristi
425fbce7be Translated using Weblate (Dutch) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/nl/
 2022-09-02 19:18:40 +00:00
Fristi
a6195c7127 Added translation using Weblate (Dutch) 2022-09-02 19:18:40 +00:00
Fristi
e949378476 Added translation using Weblate (Dutch) 2022-09-02 19:18:40 +00:00
marcin mikołajczak
8d5592ef9d Update @context 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-29 11:45:46 +02:00
marcin mikołajczak
64d515df28 Use colors from frontend configuration 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-25 14:58:28 +02:00