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

15085 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Fristi
e949378476 Added translation using Weblate (Dutch) 2022-09-02 19:18:40 +00:00
Haelwenn
01239456a1 Merge branch 'rewrite/integration-test-websocket-client' into 'develop' 
Rewrite integration-test websocket client with Mint.WebSocket, closes #2812

Closes #2812

See merge request pleroma/pleroma!3649
 2022-09-02 19:18:22 +00:00
marcin mikołajczak
2fbbf9eec1 EventController.create: Use location_id 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-01 23:08:10 +02:00
Alex Gleason
e94b73052f Merge branch 'compat-ua' into 'develop' 
Use "Pleroma" in user-agent

See merge request soapbox-pub/rebased!171
 2022-09-01 13:34:09 +00:00
Alex Gleason
9578013fc2
Use "Pleroma" in user-agent 2022-09-01 08:03:34 -05:00
Tusooa Zhu
c32e28e1b0
Fix SideEffectsTest 2022-09-01 07:33:58 -04:00
Tusooa Zhu
20a0dd6516
Exclude Announce instead of restricting to Create in visibility_tags 2022-08-31 22:14:54 -04:00
Tusooa Zhu
ffd379456b
Do not stream out Announces to public timelines 2022-08-31 15:57:06 -04:00
marcin mikołajczak
f610f051e8 Merge branch 'merge-pleroma' into 'develop' 
merge pleroma

See merge request soapbox-pub/rebased!170
 2022-08-30 18:31:32 +00:00
marcin mikołajczak
a7687b197d Handle banner_id 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-30 11:05:34 +02:00
marcin mikołajczak
a15bf235cf Merge remote-tracking branch 'pleroma/develop' into HEAD 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-30 10:15:07 +02:00
marcin mikołajczak
ee8f11b085 Export to ical 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-30 10:05:39 +02:00
Alex Gleason
8f6d1ca33e
Don't warn importing prod.secret.exs if CI=true 2022-08-29 21:33:25 -05:00
Alex Gleason
2c2d532836
GitLab CI: don't use cached deps for release 2022-08-29 20:48:51 -05:00
Alex Gleason
35111b5b53
GitLab CI: try copying prod build for test 2022-08-29 20:01:55 -05:00
Alex Gleason
71632053bb Merge branch 'readme-logo' into 'develop' 
README: check Rebased logo into repo

See merge request soapbox-pub/rebased!169
 2022-08-29 17:07:42 +00:00
Alex Gleason
0696ecc4b4
README: check Rebased logo into repo 2022-08-29 11:52:57 -05:00
marcin mikołajczak
8d5592ef9d Update @context 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-29 11:45:46 +02:00
Tusooa Zhu
f9b86c3c22
Make local-only posts stream in local timeline 2022-08-27 19:34:56 -04:00
Tusooa Zhu
3afa1903ee
Do not stream out Create of ChatMessage 2022-08-27 17:51:41 -04:00
marcin mikołajczak
62add6cfbd WIP location handling 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-27 22:57:54 +02:00
tusooa
497cd5d5da Merge branch 'fix/fedi-fe-build-url' into 'develop' 
Fix fedi-fe build URL, addresses #2920

See merge request pleroma/pleroma!3736
 2022-08-27 01:13:03 +00:00
tusooa
a546e6f042 Merge branch 'feature/emoji-15-support' into 'develop' 
emoji-test: update to latest 15.0 draft

See merge request pleroma/pleroma!3726
 2022-08-27 00:59:22 +00:00
tusooa
780fb4514d Merge branch 'from/upstream-develop/tusooa/static-page-styles' into 'develop' 
Improve static page style

See merge request pleroma/pleroma!3729
 2022-08-27 00:58:18 +00:00
Alex Gleason
770058b274
unit-testing --> test 2022-08-26 17:37:59 -05:00
Alex Gleason
b1bea70f8e
Overhaul CI 2022-08-26 17:36:49 -05:00
Alex Gleason
d8761c0fb7
Use Soapbox CI base image 2022-08-26 16:31:10 -05:00
Alex Gleason
8833ea7a1b Merge branch 'rebased-fixes' into 'develop' 
Fix Rebased --> Pleroma instance version

See merge request soapbox-pub/rebased!167
 2022-08-25 19:28:51 +00:00
Alex Gleason
d230d70170
Nodeinfo: fix Rebased --> Pleroma 2022-08-25 14:11:28 -05:00
Alex Gleason
a4c9739965
Fix Rebased --> Pleroma instance version 2022-08-25 14:02:38 -05:00
tusooa
84a573877a Merge branch 'fix_erratic_tests' into 'develop' 
Fix flaky rate_limiter_test.exs test "it restricts based on config values"

See merge request pleroma/pleroma!3688
 2022-08-25 18:39:38 +00:00
tusooa
6811237ffd Merge branch 'fix_flaky_transfer_task_test.exs' into 'develop' 
Fix flaky/erratic test/pleroma/config/transfer_task_test.exs

See merge request pleroma/pleroma!3703
 2022-08-25 18:38:18 +00:00
tusooa
6f10f93d62 Merge branch 'fix_erratic_participation_test' into 'develop' 
fix flaky participation_test.exs

See merge request pleroma/pleroma!3689
 2022-08-25 18:36:47 +00:00