|
|
bda8589f16
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-03-15 19:39:24 +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 |
|
marcin mikołajczak
|
c6c724cea1
|
Merge branch 'merge-pleroma' into 'develop'
merge pleroma
See merge request soapbox-pub/rebased!229
|
2023-02-04 22:39:35 +00:00 |
|
marcin mikołajczak
|
9e3468c833
|
Merge branch 'develop' into 'internal-webhooks'
# Conflicts:
# lib/pleroma/webhook.ex
|
2023-01-11 09:58:50 +00:00 |
|
lain
|
e853cfe7c3
|
Revert "Merge branch 'copyright-bump' into 'develop'"
This reverts merge request !3825
|
2023-01-02 20:38:50 +00:00 |
|
|
|
10886eeaa2
|
Bump copyright year
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-01-01 12:13:06 +01:00 |
|
|
|
5c69ecf2bf
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2022-12-30 21:16:15 +01:00 |
|
weblate-extractor
|
64eef1eae4
|
Extract translatable strings
|
2022-12-24 06:06:39 +00:00 |
|
|
|
e3970f730c
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-23 19:45:55 +01:00 |
|
Haelwenn (lanodan) Monnier
|
2c5bc9cffd
|
Update PleromaFE bundle to 2.5.0
|
2022-12-23 15:01:49 +01:00 |
|
|
|
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 |
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
1b9b03b494
|
Add internal (not managable from API) webhooks
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-29 22:20:05 +02:00 |
|
Alex Gleason
|
f303a02e86
|
Let favicon be configurable
|
2022-10-27 13:15:15 -05:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c6fddd6e0a
|
Add migration cooldown period
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-28 23:48:45 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
