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

15191 commits

This branch
This branch
All branches
Author SHA1 Message Date
tusooa
c0b265b404 Merge branch 'birthday-config-description' into 'develop' 
Clarify `birthday_min_age` config description

See merge request pleroma/pleroma!3747
 2022-09-06 12:40:02 +00: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
marcin mikołajczak
86cb1897f5 Fixes, add/update tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 23:34:25 +02: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
c6bc523914 Clarify birthday_min_age config description 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 20:25:01 +02: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
a84d9b78f6 Display location, mix format 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 18:24:37 +02:00
Haelwenn
b8d6cb5845 Merge branch 'from/upstream-develop/tusooa/2892-backup-scope' into 'develop' 
Make backups require its own scope

Closes #2892

See merge request pleroma/pleroma!3721
 2022-09-05 15:42:02 +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
tusooa
9874b4c985 Merge branch 'develop' into 'from/upstream-develop/tusooa/2892-backup-scope' 
# Conflicts:
#   CHANGELOG.md
 2022-09-05 15:00:19 +00: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
marcin mikołajczak
8fc5609cdf Add icalendar to dependencies 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 15:23:06 +02:00
marcin mikołajczak
f1607c3d3b Add geospatial package dependency 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 13:53:13 +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
Hélène
cfb1bc967f
Migrations: generate unset user keys 
User keys are now generated on user creation instead of "when needed",
to prevent race conditions in federation and a few other issues. This
migration will generate keys missing for local users.
 2022-09-05 03:51:35 +02:00
Hélène
cd237d22f1
User: generate private keys on user creation 
This fixes a race condition bug where keys could be regenerated
post-federation, causing activities and HTTP signatures from an user to
be dropped due to key differences.
 2022-09-05 03:51:17 +02: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
Haelwenn (lanodan) Monnier
80a2528fd1 ci-base: Document building and pushing a new image 2022-09-03 18:19:58 +02: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 (lanodan) Monnier
ec80a1e405 Bump minimum Elixir version to 1.10 
1.9 being end-of-life
 2022-09-03 03:58:22 +02:00
Haelwenn (lanodan) Monnier
24af2e1c58 script_test: Fix %ErlangError for Elixir 1.14 2022-09-03 03:58:22 +02:00
Haelwenn (lanodan) Monnier
e124776d14 Elixir 1.14 formatting 2022-09-03 03:58:22 +02:00
Haelwenn (lanodan) Monnier
93ed6da4a3 mix: Switch prometheus_ex to fix/elixir-1.14 branch 2022-09-03 03:58:22 +02:00
Haelwenn (lanodan) Monnier
2f301bbb87 timeline_controller_test: Fix test name for elixir 1.14 2022-09-03 03:58:22 +02:00
Tusooa Zhu
6d148b6637 Use Websockex to replace websocket_client 2022-09-03 02:13:00 +02: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