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

15124 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
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
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
Alex Gleason
0cd15c997c
TagValidator: allow Link tags, don't go nuclear for unrecognized Tag types 2022-10-01 19:56:11 -05: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
Haelwenn
d43d02bf41 Merge branch 'from/upstream-develop/tusooa/fix-static-tests' into 'develop' 
Make instance document controller test sync

Closes #2940

See merge request pleroma/pleroma!3757
 2022-09-27 21:50:43 +00:00
Haelwenn
757a21554f Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop' 
Reduce incoming and outgoing federation queue sizes to 5

Closes #2169

See merge request pleroma/pleroma!3756
 2022-09-27 21:50:06 +00:00
Haelwenn
5d7d623390 Merge branch 'bugfix/elixir-1.14' into 'develop' 
Bugfix: Elixir 1.14

See merge request pleroma/pleroma!3740
 2022-09-27 21:46:03 +00:00
marcin mikołajczak
54daefaecc Merge branch 'manifest' into 'develop' 
Add shortcuts and share_target to manifest.json

See merge request soapbox-pub/rebased!182
 2022-09-24 19:26:11 +00: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
Tusooa Zhu
e66c02b775
Make instance document controller test sync 2022-09-20 12:34:10 -04:00
tusooa
ac95b8b4f3 Merge branch 'websocketex' into 'develop' 
Use Websockex to replace websocket_client

See merge request pleroma/pleroma!3743
 2022-09-18 17:09:12 +00:00
Tusooa Zhu
467b6cad6f
Reduce incoming and outgoing federation queue sizes to 5 2022-09-17 16:34:33 -04:00
tusooa
1a7107f4a5 Merge branch 'remove_from_followers' into 'develop' 
MastoAPI: POST /api/v1/accounts/:id/remove_from_followers

See merge request pleroma/pleroma!3647
 2022-09-16 23:24:13 +00:00
Alex Gleason
64efa18c38 Merge branch 'object-delete-slower' into 'develop' 
Slow down ContextObjectsDeletionMigrator

Closes #102

See merge request soapbox-pub/rebased!181
 2022-09-16 01:11:05 +00:00
a1batross
7f63b4c315 User: search: exclude deactivated users from user search 
This way we don't pollute search results with deactivated and deleted users
 2022-09-16 00:49:16 +03:00
Alex Gleason
589e9b395f
Slow down ContextObjectsDeletionMigrator 2022-09-15 11:37:09 -05:00
Tusooa Zhu
ea60c4e709
Fix wrong relationship direction 2022-09-14 20:24:04 -04:00
Alex Gleason
c6e4a12322 Merge branch 'soapbox-fe' into 'develop' 
soapbox-fe --> soapbox

See merge request soapbox-pub/rebased!180
 2022-09-13 23:13:41 +00:00
Alex Gleason
2f259173c3
Tag erratic tests 2022-09-13 15:57:50 -05:00
Alex Gleason
f5e77a3eaa
soapbox-fe --> soapbox 2022-09-13 15:26:28 -05:00
tusooa
90d4b7d604 Merge branch 'fix/user-factory-speed' into 'develop' 
tests/Factory: improve user generation performance

See merge request pleroma/pleroma!3754
 2022-09-12 00:53:14 +00:00
FloatingGhost
6bdf451ce8
Use set of pregenerated RSA keys 
Randomness is a huge resource sink, so let's just use
a some that we made earlier
 2022-09-11 21:33:20 +02:00
tusooa
ac427de851 Merge branch 'fix/undo-boosts' into 'develop' 
ObjectView: do not fetch an object for its ID

See merge request pleroma/pleroma!3753
 2022-09-11 17:10:26 +00:00
Hélène
0b19625bfb
ObjectView: do not fetch an object for its ID 
Non-Create/Listen activities had their associated object field
normalized and fetched, but only to use their `id` field, which is both
slow and redundant. This also failed on Undo activities, which delete
the associated object/activity in database.

Undo activities will now render properly and database loads should
improve ever so slightly.
 2022-09-11 04:54:04 +02:00
marcin mikołajczak
98ccf6cbdc Merge branch 'webfinger-expanding' into 'develop' 
Webfinger expanding

See merge request soapbox-pub/rebased!96
 2022-09-10 22:03:10 +00:00