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

15657 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Gleason
611097b1a6 Merge branch 'mix-format' into 'develop' 
mix format

See merge request soapbox-pub/rebased!195
 2022-10-28 21:26:26 +00:00
Alex Gleason
b734e2f3f1
mix format 2022-10-28 16:09:59 -05:00
Alex Gleason
74c360e4d6 Merge branch 'feature/add-prom_ex' into 'develop' 
Add PromEx

See merge request soapbox-pub/rebased!193
 2022-10-28 20:58:56 +00:00
marcin mikołajczak
f476bc2c35 Merge branch 'instance-v2' into 'develop' 
Add /api/v2/instance route

See merge request soapbox-pub/rebased!194
 2022-10-28 20:12:16 +00:00
marcin mikołajczak
dea3110ef5 Merge remote-tracking branch 'soapbox/develop' into instance-v2 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-28 20:12:29 +02:00
marcin mikołajczak
a77a7a3620 Add /api/v2/instance route 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-28 20:10:10 +02:00
Josh Adams
7edf9d4990 Replace deprecated @view_module 
See https://gist.github.com/chrismccord/e53e79ef8b34adf5d8122a47db44d22f#update-your-layouts
 2022-10-27 21:03:06 -05:00
Josh Adams
5f2513d119 Make release not break things but be dumb 2022-10-27 20:26:07 -05:00
Josh Adams
36dc0fee1e Don't use a fake ecto feature 
See https://github.com/elixir-ecto/ecto/issues/3889
 2022-10-27 20:14:55 -05:00
Josh Adams
ec4dc4adac Remove unnecessary newline 
L I N T E R S
 2022-10-27 20:03:45 -05:00
Josh Adams
ec6ee11ea7 Add most (all?) the promex setup 2022-10-27 19:47:37 -05:00
Josh Adams
b6ef38d611 Bump a ton of dependencies 
All in service of bringing in prom_ex, we'll see
 2022-10-27 19:38:35 -05:00
Alex Gleason
ad014adc1c Merge branch 'configurable-favicon' into 'develop' 
Let favicon be configurable

See merge request soapbox-pub/rebased!192
 2022-10-27 20:03:32 +00:00
Alex Gleason
e88d52c4de
Fix OStatusControllerTest 2022-10-27 14:21:13 -05:00
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
tusooa
59b8c920f6 Merge branch 'release/2.4.4' into 'stable' 
Release/2.4.4

See merge request pleroma/pleroma!3761
 2022-10-09 02:05:27 +00: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