sam/pleroma
sam
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,044 Commits 2 Branches 40 Tags 290 MiB
Commit Graph

1155 Commits

Author SHA1 Message Date
Sam Therapy 28fde4d87a
Merge branch 'develop' of ssh://git.pleroma.social:2222/pleroma/pleroma into froth 2023-05-23 00:05:22 +02:00
Haelwenn ce1c0f75cd Merge branch 'tusooa/3065-scopes' into 'develop' 
OAuth scopes descriptions

Closes #3065

See merge request pleroma/pleroma!3848
 2023-05-17 18:51:26 +00:00
tusooa 163e82bab1
Allow lang attribute 2023-05-09 19:27:32 -04:00
tusooa 9283c784a3
Add English translation for oauth scopes 2023-05-02 17:03:09 -04:00
tusooa 530284e1b9
Add extracted pot 2023-05-02 16:32:33 -04:00
Sam Therapy 5b7c7089a7
Merge branch 'develop' of ssh://git.pleroma.social:2222/pleroma/pleroma into froth 2023-03-23 13:14:43 +01:00
tusooa f33401f54b
Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1 2023-03-01 20:09:50 -05:00
tusooa 5d34fe1868
Bundle frontend 2023-02-20 12:37:44 -05:00
weblate-extractor 274b3a0d26 Extract translatable strings 2023-02-18 06:06:52 +00:00
lain e853cfe7c3 Revert "Merge branch 'copyright-bump' into 'develop'" 
This reverts merge request !3825
 2023-01-02 20:38:50 +00:00
marcin mikołajczak 10886eeaa2 Bump copyright year 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-01-01 12:13:06 +01:00
Sam Therapy 68bebfba57
Merge branch 'develop' 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-12-27 15:33:59 +01:00
Sam Therapy af715bbf70
Revert Static FE 2022-12-27 15:22:45 +01:00
weblate-extractor 64eef1eae4 Extract translatable strings 2022-12-24 06:06:39 +00:00
Haelwenn (lanodan) Monnier 2c5bc9cffd Update PleromaFE bundle to 2.5.0 2022-12-23 15:01:49 +01:00
Haelwenn (lanodan) Monnier cf1d91c718 Update AdminFE bundle to version 2.5.0 2022-12-21 13:03:32 +01:00
weblate-extractor b3d250a70a Extract translatable strings 2022-12-20 06:11:50 +00:00
Sam Therapy b8a7e65ba1
Merge branch 'develop' of ssh://git.pleroma.social:2222/pleroma/pleroma into froth 2022-12-18 13:39:06 +01: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
Xnuk Shuman 3e8f49be67 Added translation using Weblate (Korean) 2022-12-01 17:17:03 +00:00
Sam Therapy e67e72de1b
Merge develop again, again :) 2022-11-28 18:39:15 +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
Sam Therapy 1f1b72a11f
fix some XSS maybe 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-11-26 18:35:27 +01:00
Sam Therapy 7ad1637a7a
Update Admin-FE 2022-11-22 23:53:01 +01:00
Sol Fisher Romanoff 064be8fe71
Fix css for mobile devices 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 9e010a2bc2
Organize CSS and add light theme 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 4e463b0a8a
Add followers/following tabs 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 80fb9efc5a
Add with_replies and media tabs 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 0faf544ebb
Add reply to and edited at headers 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 037baa6e58
Add nsfw banner to attachments 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 3289b410b3
tabs => spaces 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 35613d9c86
Add fontawesome icons 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff aabe72f41e
Make attachments fit into statuses 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 0ee31347e4
Add newer and older posts buttons 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 44b61eb776
Make navbar and background scroll-friendly 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 6a99c55435
Add admin/mod/bot indicators 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 16ddd5a9c9
Overhaul profile page 
todo: posts/with replies/attachments switch
 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff 581a54e67f
Add navbar, sidebar and background to static-fe 2022-11-18 22:55:35 +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
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
weblate-extractor 1ac9bd0b4c Extract translatable strings 2022-10-11 06:13:00 +00: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
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