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

15386 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Gleason
6f04447f49
mix format 2022-10-27 13:51:37 -05:00
Alex Gleason
bddd4375bf
Expose favicon URL in instance API 2022-10-27 13:51:25 -05:00
Alex Gleason
35f16d9c47
Render title and favicon on all pages that serve index.html 2022-10-27 13:29:36 -05:00
Alex Gleason
f303a02e86
Let favicon be configurable 2022-10-27 13:15:15 -05:00
tusooa
9fbf01f7a9 Merge branch 'push-updates' into 'develop' 
Push.Impl: support edits

See merge request pleroma/pleroma!3760
 2022-10-27 12:51:29 +00:00
marcin mikołajczak
27fb0c80ba Use color overrides from frontend configuration 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-27 00:12:39 +02:00
marcin mikołajczak
470c2ec15f Add Accept test 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-25 23:10:21 +02:00
feld
7a519b6a66 Merge branch 'fix-deprecation-text' into 'develop' 
Fix deprecation warning for Gun timeout

See merge request pleroma/pleroma!3759
 2022-10-24 14:22:49 +00:00
Haelwenn
705ba6d615 Merge branch 'security/PleromaAPI-delete' into 'develop' 
CommonAPI: generate ModerationLog for all admin/moderator deletes

See merge request pleroma/pleroma!3765
 2022-10-15 12:54:20 +00:00
Haelwenn (lanodan) Monnier
16b06160ac CommonAPI: generate ModerationLog for all admin/moderator deletes 
As a side-effect it also changes the ChatMessage delete ID to an
Activity.id rather than MessageReference.id

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2958
 2022-10-14 18:51:08 +02:00
marcin mikołajczak
5f54228e38 Send event updates to participants 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-12 23:57:05 +02:00
marcin mikołajczak
7ea96a1f56 More tests? 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-12 23:54:30 +02:00
marcin mikołajczak
8221504ecb Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-10-12 21:52:36 +02:00
tusooa
c830282628 Merge branch 'weblate-extract' into 'develop' 
Extract translatable strings

See merge request pleroma/pleroma!3752
 2022-10-11 21:21:36 +00:00
weblate-extractor
1ac9bd0b4c Extract translatable strings 2022-10-11 06:13:00 +00:00
Alex Gleason
0447197378 Merge branch 'merge-pleroma' into 'develop' 
Merge Pleroma

See merge request soapbox-pub/rebased!184
 2022-10-10 01:22:54 +00:00
Alex Gleason
22a1532850 Merge branch 'link-tag-fix' into 'develop' 
Support FEP-e232 quote posts

See merge request soapbox-pub/rebased!185
 2022-10-09 22:36:58 +00:00
Alex Gleason
0ee413400f
FEP-e232: support Link mediaType "application/activity+json" 2022-10-09 15:25:34 -05:00
Alex Gleason
035d9e71eb
Merge remote-tracking branch 'origin/develop' into merge-pleroma 2022-10-09 13:58:19 -05:00
Alex Gleason
7ac6f4b6ea
Merge remote-tracking branch 'origin/develop' into link-tag-fix 2022-10-09 13:57:29 -05:00
Alex Gleason
04ee564077 Merge branch 'erratic-move-tests' into 'develop' 
Tag erratic Move tests

See merge request soapbox-pub/rebased!190
 2022-10-09 18:57:11 +00:00
Alex Gleason
ddaeb09e54
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-10-09 13:46:48 -05:00
Alex Gleason
147f6c4f63
Tag erratic Move tests 2022-10-09 13:37:27 -05:00
Alex Gleason
872729dc7e
Merge remote-tracking branch 'origin/develop' into link-tag-fix 2022-10-09 13:27:57 -05:00
Alex Gleason
11dfc2589a
Add support for FEP-e232 quotes without quoteUrl 2022-10-09 13:27:16 -05:00
Alex Gleason
33a4716843 Merge branch 'gitlab-ci-dind' into 'develop' 
GitLab CI: tag `dind`

See merge request soapbox-pub/rebased!189
 2022-10-09 17:26:19 +00:00
Alex Gleason
23ab8e12b9 GitLab CI: tag dind 2022-10-09 17:25:23 +00:00
tusooa
8042e0ebe1 Merge branch 'mergeback/2.4.4' into 'develop' 
mergeback: 2.4.4

See merge request pleroma/pleroma!3762
 2022-10-09 04:29:09 +00:00
Tusooa Zhu
dd82fd234f
Merge branch 'release/2.4.4' into mergeback/2.4.4 2022-10-08 22:15:09 -04:00
marcin mikołajczak
ba642aaf6a Fix tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-06 23:33:06 +02:00
marcin mikołajczak
512398a556 Merge branch 'fix-migration' into 'develop' 
Fix down() in AddUpdateToNotificationsEnum migration for Rebased

See merge request soapbox-pub/rebased!186
 2022-10-05 22:38:44 +00: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
678b6ce17c Add more tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-06 00:06:34 +02:00
marcin mikołajczak
e187aff5dd Add some tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-03 23:10:02 +02:00
marcin mikołajczak
c45612badd Update spec, fix tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-03 20:13:44 +02:00
marcin mikołajczak
73e7549d94 Update scheduled notitfications on edit 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-02 16:32:34 +02:00
Alex Gleason
0cd15c997c
TagValidator: allow Link tags, don't go nuclear for unrecognized Tag types 2022-10-01 19:56:11 -05:00
marcin mikołajczak
1b238a4fad Push.Impl: support edits 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-01 23:28:02 +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
9ff0eb5c4b Fix event updates 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-01 18:01:52 +02:00
marcin mikołajczak
58e0ca0d68 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-09-30 20:04:29 +02:00
Mark Felder
1958f23fe7 Fix deprecation warning for Gun timeout 2022-09-30 12:22:06 -04:00
Alex Gleason
f6afe649fe
GenerateUnsetUserKeys: only select necessary user fields 2022-09-28 17:58:25 -05:00
Alex Gleason
9137089895
CI Docker: remove README, adapt build_and_push.sh 2022-09-28 17:42:57 -05:00
Alex Gleason
5dfb582bd2
Revert "Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop'" 
This reverts commit 757a21554f, reversing
changes made to 5d7d623390.
 2022-09-28 17:41:36 -05:00
Alex Gleason
ecd2d32dc2
ci/Dockerfile: tabs to spaces 2022-09-28 17:39:58 -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
31f5bafe64 Merge branch 'move-cooldown-period' into 'develop' 
Add migration cooldown period

Closes #107

See merge request soapbox-pub/rebased!183
 2022-09-28 22:00:40 +00: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
Haelwenn
3f1c31b7cd Merge branch 'fix/exclude-deactivated-in-search' into 'develop' 
User: search: exclude inactive users from user search

See merge request pleroma/pleroma!3755
 2022-09-27 23:58:45 +00:00