Sean King
2e310b3ec8
Fix more build errors
3 years ago
Sean King
839c2c6a12
Fix code mistake in OAuth controller
3 years ago
Sean King
dc4814f0cd
Fix merge conflicts with upstream
3 years ago
Haelwenn
0c56f9de0d
Merge branch 'tests/openapi-everywhere' into 'develop'
...
Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324
3 years ago
feld
a07310888f
Merge branch 'fix/missing-deprecation' into 'develop'
...
Add missing deprecation warning left out of !2842
See merge request pleroma/pleroma!3444
3 years ago
feld
922f4e3fb7
Merge branch 'bugfix/erlang-24' into 'develop'
...
Erlang 24 compatibility
Closes #2647
See merge request pleroma/pleroma!3405
3 years ago
Mark Felder
f58928cf1c
Add missing deprecation warning left out of !2842
3 years ago
Haelwenn (lanodan) Monnier
11844084d0
MIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []
...
Since mime 1.6.0:
warning: MIME.valid?/1 is deprecated. Use MIME.extensions(type) != [] instead
As for the bitstring(type) part it's because MIME.extensions only expects a string.
https://github.com/elixir-plug/mime/issues/43
3 years ago
Haelwenn (lanodan) Monnier
24d66b60a0
request_builder_test: mode :read got removed
3 years ago
Haelwenn (lanodan) Monnier
5c3a0dd26e
factory: Fix article_factory
3 years ago
Haelwenn (lanodan) Monnier
7c5e007b9c
mix: Update pot to ~> 1.0
3 years ago
Haelwenn (lanodan) Monnier
ab32ea44f0
mix.exs: Apply OTP24 fixes to web_push_encryption
3 years ago
Haelwenn (lanodan) Monnier
2768063387
mix: Update dependencies
3 years ago
Haelwenn (lanodan) Monnier
168687eef2
media_proxy: switch from :crypto.hmac to :crypto.mac
3 years ago
Haelwenn (lanodan) Monnier
166455c884
mix: Switch hackney & gun to releases
3 years ago
Haelwenn (lanodan) Monnier
59af07f149
Update all dependencies
3 years ago
Haelwenn
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
3 years ago
rinpatch
194a41611b
Merge branch 'chore/cicd_skip_nonsense' into 'develop'
...
Skip CI/CD automatically under certain conditions
See merge request pleroma/pleroma!3439
3 years ago
Mark Felder
9f391da73d
Don't generate new specs unless they've changed.
3 years ago
Mark Felder
e06466a532
Skip build, test, analysis/lint when we don't make code changes
3 years ago
feld
275af29302
Merge branch 'Snow-develop-patch-01683' into 'develop'
...
Update docs/description for allow_relay
See merge request pleroma/pleroma!3438
3 years ago
Mark Felder
679d4c23e9
Update wording for relays in docs and config description
3 years ago
Mark Felder
297feb73f4
Formatting
3 years ago
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
3 years ago
Mark Felder
dcf84ac12e
disableChat / disableShout didn't actually do anything for PleromaFE
3 years ago
Alex Gleason
028017711c
Merge remote-tracking branch 'pleroma/develop' into cycles-email
3 years ago
Alex Gleason
9879c18548
Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint
...
Speeds up recompilation by fixing cycles in UserEmail
3 years ago
feld
3fe6ada6fc
Merge branch 'cycles-streaming' into 'develop'
...
Recompilation speedup: Remove deps from Streaming/Persisting behaviors
See merge request pleroma/pleroma!3434
3 years ago
feld
dea035dc49
Merge branch 'cycles-uploader' into 'develop'
...
Recompilation speedup: Remove deps from Uploader behaviour
See merge request pleroma/pleroma!3435
3 years ago
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.
3 years ago
Alex Gleason
f6d2bd738d
Merge remote-tracking branch 'pleroma/develop' into cycles-uploader
3 years ago
Alex Gleason
8a5ceb7e53
Remove deps from Uploader behaviour
...
Speeds up recompilation by limiting compile-time deps
3 years ago
Alex Gleason
708210b994
Merge remote-tracking branch 'pleroma/develop' into cycles-streaming
3 years ago
Alex Gleason
a744c47e9a
Remove deps from Streaming/Persisting behaviors
...
Speeds up recompilation by limiting compile-time deps
3 years ago
Mark Felder
2743c66693
Add "chat" back as a feature for backwards compat.
...
Legacy PleromaFE uses this to identify if ShoutBox is available.
3 years ago
Mark Felder
48a0ea2fc3
Wire up join requests to the old "chat:public" channel into the new "shout:public" channel
3 years ago
Mark Felder
d9513b11d3
Forgot to move migration test when rebasing
3 years ago
Mark Felder
9ce2c017c0
We want clear_config/2 in all tests now
3 years ago
Roman Chvanikov
d7dfa6d27c
Update test for RenameInstanceChat migration
3 years ago
Roman Chvanikov
e0bb655773
Add RenameInstanceChat migration
3 years ago
Mark Felder
01f796f8bb
Add a test for the migration
3 years ago
Mark Felder
8ff2d8d17d
Update description file for new shout config setting location
3 years ago
Mark Felder
d6432a65da
Move shout configuration from :instance, update docs and changelog
3 years ago
Mark Felder
4a181982c3
More confusingly named legacy chat code renamed to shout
3 years ago
Mark Felder
a3cff59659
Ensure we actually start ShoutChannel
3 years ago
Mark Felder
36fe8950f7
Update PleromaFE settings for the old chat box
3 years ago
Mark Felder
68aa56b9e4
Just call it shout
3 years ago
Mark Felder
ff00b354fa
Rename the non-federating Chat feature to Shout
3 years ago
feld
ee52fc840d
Merge branch 'cycles-constants' into 'develop'
...
Recompilation speedup: move as_local_public/0 into ActivityPub.Utils
See merge request pleroma/pleroma!3431
3 years ago
Alex Gleason
c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
3 years ago