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

13907 commits

This branch
This branch
All branches
Author SHA1 Message Date
Haelwenn (lanodan) Monnier
2768063387
mix: Update dependencies 2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
168687eef2
media_proxy: switch from :crypto.hmac to :crypto.mac 2021-06-03 19:11:15 +02:00
Haelwenn (lanodan) Monnier
166455c884
mix: Switch hackney & gun to releases 2021-06-03 19:10:47 +02:00
Haelwenn (lanodan) Monnier
59af07f149
Update all dependencies 2021-06-03 19:10:47 +02:00
Haelwenn
a5dce42c85 Merge branch 'chore/rename-chat' into 'develop' 
Rename the non-federating Chat feature to Shout

See merge request pleroma/pleroma!2842
 2021-06-03 15:52:16 +00:00
Alex Gleason
b327666f67 Merge branch 'cycles-phase-2' into 'develop' 
Cycles phase 2

See merge request soapbox-pub/soapbox!32
 2021-06-02 22:19:19 +00:00
Alex Gleason
1b73ff5ec0
Fix apparent Web.base_url() calls 
For some reason these weren't changed in this branch
 2021-06-02 16:57:14 -05:00
Alex Gleason
854b6ce816
Merge remote-tracking branch 'origin/develop' into cycles-phase-2 2021-06-02 16:12:45 -05:00
Alex Gleason
15c00f51be
Merge commit '10dfe814795f16d6c32f5b6a7421e3e7c597f1ad' into cycles-phase-2 2021-06-02 14:45:21 -05:00
Alex Gleason
ce7bc185a1
Merge commit '721c966842c2f9b4f4d6f227ecf3de69d2e66346'; commit 'a744c47e9a43a751438973a66b7201b006c6b944'; commit '8a5ceb7e53f1817f83a72b997f6b9daa7070972b'; commit '9879c18548c1b9f37df724259f65d5cd098f44c5' into cycles-phase-2 2021-06-02 14:44:22 -05:00
rinpatch
194a41611b Merge branch 'chore/cicd_skip_nonsense' into 'develop' 
Skip CI/CD automatically under certain conditions

See merge request pleroma/pleroma!3439
 2021-06-02 17:18:10 +00:00
Mark Felder
9f391da73d Don't generate new specs unless they've changed. 2021-06-02 12:09:41 -05:00
Mark Felder
e06466a532 Skip build, test, analysis/lint when we don't make code changes 2021-06-02 12:03:34 -05:00
feld
275af29302 Merge branch 'Snow-develop-patch-01683' into 'develop' 
Update docs/description for allow_relay

See merge request pleroma/pleroma!3438
 2021-06-02 16:53:37 +00:00
Mark Felder
679d4c23e9 Update wording for relays in docs and config description 2021-06-02 11:30:09 -05:00
Mark Felder
297feb73f4 Formatting 2021-06-02 11:21:04 -05:00
feld
e8de1005f2 Merge branch 'cycles-email' into 'develop' 
Recompilation speedup: Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint

See merge request pleroma/pleroma!3436
 2021-06-02 16:11:49 +00:00
Mark Felder
dcf84ac12e disableChat / disableShout didn't actually do anything for PleromaFE 2021-06-01 16:53:32 -05:00
Alex Gleason
028017711c
Merge remote-tracking branch 'pleroma/develop' into cycles-email 2021-06-01 16:17:43 -05:00
Alex Gleason
9879c18548
Avoid use Phoenix.Swoosh to prevent recompiling the Endpoint 
Speeds up recompilation by fixing cycles in UserEmail
 2021-06-01 16:17:03 -05:00
feld
3fe6ada6fc Merge branch 'cycles-streaming' into 'develop' 
Recompilation speedup: Remove deps from Streaming/Persisting behaviors

See merge request pleroma/pleroma!3434
 2021-06-01 19:41:37 +00:00
feld
dea035dc49 Merge branch 'cycles-uploader' into 'develop' 
Recompilation speedup: Remove deps from Uploader behaviour

See merge request pleroma/pleroma!3435
 2021-06-01 19:39:36 +00:00
Mark Felder
0be7eada92 Keep original Shoutbox channel name as chat:public 
There is no sane / high level workaround for merging users who join shout:public and chat:public.
 2021-06-01 14:34:13 -05:00
Alex Gleason
f6d2bd738d
Merge remote-tracking branch 'pleroma/develop' into cycles-uploader 2021-06-01 14:20:31 -05:00
Alex Gleason
8a5ceb7e53
Remove deps from Uploader behaviour 
Speeds up recompilation by limiting compile-time deps
 2021-06-01 14:19:45 -05:00
Alex Gleason
708210b994
Merge remote-tracking branch 'pleroma/develop' into cycles-streaming 2021-06-01 13:56:40 -05:00
Alex Gleason
a744c47e9a
Remove deps from Streaming/Persisting behaviors 
Speeds up recompilation by limiting compile-time deps
 2021-06-01 13:55:07 -05:00
Mark Felder
2743c66693 Add "chat" back as a feature for backwards compat. 
Legacy PleromaFE uses this to identify if ShoutBox is available.
 2021-06-01 13:17:50 -05:00
Mark Felder
48a0ea2fc3 Wire up join requests to the old "chat:public" channel into the new "shout:public" channel 2021-06-01 11:56:51 -05:00
Mark Felder
d9513b11d3 Forgot to move migration test when rebasing 2021-06-01 11:49:47 -05:00
Mark Felder
9ce2c017c0 We want clear_config/2 in all tests now 2021-06-01 11:49:47 -05:00
Roman Chvanikov
d7dfa6d27c Update test for RenameInstanceChat migration 2021-06-01 11:49:47 -05:00
Roman Chvanikov
e0bb655773 Add RenameInstanceChat migration 2021-06-01 11:49:47 -05:00
Mark Felder
01f796f8bb Add a test for the migration 2021-06-01 11:49:47 -05:00
Mark Felder
8ff2d8d17d Update description file for new shout config setting location 2021-06-01 11:49:47 -05:00
Mark Felder
d6432a65da Move shout configuration from :instance, update docs and changelog 2021-06-01 11:49:46 -05:00
Mark Felder
4a181982c3 More confusingly named legacy chat code renamed to shout 2021-06-01 11:49:16 -05:00
Mark Felder
a3cff59659 Ensure we actually start ShoutChannel 2021-06-01 11:49:16 -05:00
Mark Felder
36fe8950f7 Update PleromaFE settings for the old chat box 2021-06-01 11:49:16 -05:00
Mark Felder
68aa56b9e4 Just call it shout 2021-06-01 11:49:16 -05:00
Mark Felder
ff00b354fa Rename the non-federating Chat feature to Shout 2021-06-01 11:49:14 -05:00
feld
ee52fc840d Merge branch 'cycles-constants' into 'develop' 
Recompilation speedup: move as_local_public/0 into ActivityPub.Utils

See merge request pleroma/pleroma!3431
 2021-06-01 16:43:51 +00:00
Alex Gleason
c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants 2021-06-01 11:33:11 -05:00
feld
75b94a2f35 Merge branch 'cycles-frontend-static' into 'develop' 
Recompilation speedup: make Router a runtime dep of FrontendStatic

See merge request pleroma/pleroma!3429
 2021-06-01 16:19:41 +00:00
feld
0ddf492c5d Merge branch 'cycles-base-url' into 'develop' 
Deprecate Pleroma.Web.base_url/0

See merge request pleroma/pleroma!3432
 2021-06-01 16:15:27 +00:00
Haelwenn
c4b4258374 Merge branch 'features/validators-note' into 'develop' 
Pipeline Ingestion: Note

Closes #290

See merge request pleroma/pleroma!2984
 2021-06-01 01:51:38 +00:00
Alex Gleason
0074e9d5a0 Merge branch 'fix-missing-imports' into 'develop' 
ActivityPub.Pipeline: fix missing imports

See merge request soapbox-pub/soapbox!31
 2021-06-01 00:14:18 +00:00
Alex Gleason
4ee6d22b30
ActivityPub.Pipeline: fix missing imports 2021-05-31 19:13:30 -05:00
Alex Gleason
7bb9b841aa Merge branch 'erlang-23.3.4.2' into 'develop' 
asdf: upgrade Erlang 23.3.4.2

Closes #19

See merge request soapbox-pub/soapbox!30
 2021-05-31 23:18:59 +00:00
Alex Gleason
d31d7e188f
asdf: upgrade Erlang 23.3.4.2 2021-05-31 18:17:20 -05:00