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

15049 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Alex Gleason
589e9b395f
Slow down ContextObjectsDeletionMigrator 2022-09-15 11:37:09 -05: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
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
Alex Gleason
31d5a6066b Merge branch 'fix-edit-test' into 'develop' 
NotificationTest: update edit notification test for async worker

See merge request soapbox-pub/rebased!177
 2022-09-06 17:37:36 +00:00
Alex Gleason
4b62d36fe5
NotificationTest: update edit notification test for async worker 2022-09-06 12:00:13 -05:00
Alex Gleason
ce9bacc3be Merge branch 'fix-subscriptions' into 'develop' 
Create notifications async with NotificationWorker, #91

See merge request soapbox-pub/rebased!173
 2022-09-06 16:33:02 +00:00
Alex Gleason
7375535af2
Update description.exs with :poll_notifications and :notifications oban queues 2022-09-06 11:04:22 -05:00
marcin mikołajczak
0680650e5d Merge branch 'merge-pleroma' into 'develop' 
merge pleroma

See merge request soapbox-pub/rebased!172
 2022-09-05 21:53:20 +00:00
Alex Gleason
8a38fcf52f Merge branch 'deps-mix-lock' into 'develop' 
GitLab CI: only run deps when mix.lock changes

See merge request soapbox-pub/rebased!175
 2022-09-05 19:57:23 +00:00
Alex Gleason
42f668558e
GitLab CI: only run deps when mix.lock changes 2022-09-05 14:28:34 -05:00
Alex Gleason
5b8b21b9e9
Fix tests for async notifications 2022-09-05 14:25:23 -05:00
marcin mikołajczak
9ab3cce7e4 Merge branch 'birthday-config-description' into 'develop' 
Clarify `birthday_min_age` config description

See merge request soapbox-pub/rebased!174
 2022-09-05 18:43:28 +00:00
marcin mikołajczak
580bb1439b Clarify birthday_min_age config description 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 20:24:04 +02:00
Alex Gleason
05a20c8d6d
Create notifications async with NotificationWorker, #91 2022-09-05 12:38:30 -05:00
marcin mikołajczak
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
Alex Gleason
c208af8472 Merge branch 'improve-ci' into 'develop' 
Improve CI

See merge request soapbox-pub/rebased!168
 2022-09-05 04:24:24 +00:00
Alex Gleason
7c426ed136
Dokku: force push to git 2022-09-04 23:00:10 -05:00
Alex Gleason
f0f4f03281
GitLab CI: build docker image 2022-09-04 22:06:02 -05:00
Alex Gleason
5d61e43703
GitLab CI: improve dokku URLs 2022-09-04 22:04:40 -05:00
Alex Gleason
99cc0b1f05
GitLab CI: do use cache for cycles 2022-09-04 21:40:36 -05:00
Alex Gleason
101eb08b07
GitLab CI: move review to test stage 2022-09-04 21:31:30 -05:00
Alex Gleason
5ba971849b
GitLab CI: try using Elixir 1.12 base image 2022-09-04 21:18:34 -05:00
Alex Gleason
a52c44da3e
GitLab CI: only run release on develop branch 2022-09-04 20:43:54 -05:00
tusooa
f8afba95b2 Merge branch 'fix/gts-federation' into 'develop' 
GoToSocial federation fixes

See merge request pleroma/pleroma!3725
 2022-09-05 01:10:34 +00: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
Haelwenn
c63cf954de Merge branch 'from/upstream-develop/tusooa/streaming-fix' into 'develop' 
Streaming fix

Closes #2796

See merge request pleroma/pleroma!3738
 2022-09-03 18:24:28 +00:00
tusooa
71839cb890 Merge branch 'changes/embed-metadata' into 'develop' 
Metadata/Utils: use summary as description if set

Closes #2491

See merge request pleroma/pleroma!3733
 2022-09-03 16:21:08 +00:00
Hélène
4477c6baff
Metadata/Utils: use summary as description if set 
When generating OpenGraph and TwitterCard metadata for a post, the
summary field will be used first if it is set to generate the post
description.
 2022-09-03 17:17:48 +02:00
marcin mikołajczak
cdf454bfd2 Merge remote-tracking branch 'pleroma/develop' into HEAD 2022-09-03 17:04:02 +02:00
marcin mikołajczak
0312f6770c Merge branch 'develop' into 'edits' 
# Conflicts:
#   priv/static/schemas/litepub-0.1.jsonld
 2022-09-03 14:14:25 +00:00
Haelwenn
257601d67d Merge branch 'ssh-bbs-improvements' into 'develop' 
BBS: add functionnalities and readability

See merge request pleroma/pleroma!3675
 2022-09-03 11:15:07 +00:00
Tusooa Zhu
d19696cf60
Lint 2022-09-02 22:58:35 -04:00
Haelwenn
299255b9bb Merge branch 'from/upstream-develop/tusooa/assoc-object-id' into 'develop' 
Add function to calculate associated object id

Closes #2307

See merge request pleroma/pleroma!3692
 2022-09-03 02:50:40 +00:00
Haelwenn
e40c221c31 Merge branch 'from/upstream-develop/tusooa/edits' into 'develop' 
Editing

Closes #1429, #2859, and #2288

See merge request pleroma/pleroma!3678
 2022-09-03 02:16:42 +00:00
Haelwenn
07ef72f493 Merge branch 'from/develop/tusooa/2807-remote-xact-post' into 'develop' 
Remote interaction with posts

Closes #2807 and #978

See merge request pleroma/pleroma!3587
 2022-09-03 02:03:48 +00:00
Haelwenn
0a05ebf789 Merge branch 'revert-01239456' into 'develop' 
Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'"

See merge request pleroma/pleroma!3742
 2022-09-02 23:58:02 +00:00
Haelwenn
b439e91f57 Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'" 
This reverts merge request !3649
 2022-09-02 22:35:40 +00:00
Haelwenn
e22a772240 Merge branch 'weblate' into 'develop' 
Translations update from Pleroma Weblate

See merge request pleroma/pleroma!3735
 2022-09-02 22:10:44 +00:00
Fristi
0d8c6b0488 Translated using Weblate (Dutch) 
Currently translated at 63.8% (30 of 47 strings)

Translation: Pleroma/Pleroma Backend (domain posix_errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-posix_errors/nl/
 2022-09-02 19:18:40 +00:00
Fristi
9af5da6666 Translated using Weblate (Dutch) 
Currently translated at 100.0% (83 of 83 strings)

Translation: Pleroma/Pleroma Backend (domain static_pages)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-static_pages/nl/
 2022-09-02 19:18:40 +00:00
Fristi
425fbce7be Translated using Weblate (Dutch) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/nl/
 2022-09-02 19:18:40 +00:00
Fristi
a6195c7127 Added translation using Weblate (Dutch) 2022-09-02 19:18:40 +00:00