d65a8bcd2d
Merge branch 'fix-otp-documentation' into 'develop'
...
fix OTP install documentation
See merge request pleroma/pleroma!3869
2023-06-11 16:45:53 +00:00
4e6ea7cc91
Merge branch 'tusooa/3054-banned-delete' into 'develop'
...
Fix deleting banned users' statuses
See merge request pleroma/pleroma!3889
2023-06-11 13:17:12 +00:00
d93b47cf2c
Merge branch 'pleroma-double_mentions' into 'develop'
...
ForceMentionsInContent: fix double mentions for Mastodon/Misskey posts
See merge request pleroma/pleroma!3903
2023-06-11 13:04:59 +00:00
6611c6ce4e
B ForceMentionsInContent: Fix test, refactor.
2023-06-11 16:45:31 +04:00
55dd8ef1c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-double_mentions
2023-06-11 16:31:20 +04:00
22878cf84a
B Migrations: Don't remove activity_visibility_index for now.
2023-06-11 16:22:16 +04:00
10dfa107d5
Update changelog
2023-06-11 16:22:03 +04:00
175ee9e6fe
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unused_indexes
2023-06-11 16:20:30 +04:00
16313af7eb
Merge branch 'fix/metadata-tags' into 'develop'
...
static frontend: fix meta tags
See merge request pleroma/pleroma!3885
2023-06-11 11:57:16 +00:00
1f4618d64b
Merge branch 'cleanup/ostatus-user-upgrade' into 'develop'
...
Cleanup OStatus-era user upgrades and ap_enabled indicator
See merge request pleroma/pleroma!3880
2023-06-11 11:13:57 +00:00
feld
75900f21f0
Merge branch 'revert-mediaproxy-host-validation' into 'develop'
...
Revert MediaProxy Host header validation
See merge request pleroma/pleroma!3902
2023-06-11 11:10:51 +00:00
1db29f734f
Merge branch 'fep-fffd-url' into 'develop'
...
CommonFields: Use BareUri for :url
Closes #3121
See merge request pleroma/pleroma!3884
2023-06-11 11:02:39 +00:00
b762a7503c
Merge branch 'distro-docs-elixir-1.11' into 'develop'
...
installation/debian_based_*: Elixir 1.11 means Debian 12+ and Ubuntu 22.04+
See merge request pleroma/pleroma!3898
2023-06-11 10:42:22 +00:00
Mark Felder
1ca1b4b32f
changelog.d
2023-06-07 09:25:57 -04:00
Mark Felder
fadcd7f1a9
Revert MediaProxy Host header validation
...
Something is going wrong here even though the tests are correct.
2023-06-07 09:19:22 -04:00
43458cb7a1
Merge branch 'preload-escaping' into 'develop'
...
B Preload: Make sure that the preloaded json is html safe
See merge request pleroma/pleroma!3901
2023-06-06 13:31:08 +00:00
Mark Felder
63ef1dcedc
Phoenix.Router.routes/1 is the public function we are meant to be using here
2023-06-03 14:17:49 -04:00
Mark Felder
c665d53295
Update to Phoenix 1.7
2023-06-03 14:06:28 -04:00
Mark Felder
bcd7ccac11
Support a type called "change"
2023-06-03 14:06:28 -04:00
feld
86b38dd14b
Merge branch 'develop' into 'phoenix1.7'
...
# Conflicts:
# mix.exs
2023-06-02 15:41:40 +00:00
Mark Felder
2e45be2653
Add :phoenix to extra_applications to suppress a warning
...
Related to use of Phoenix.Flash.get/2
2023-06-02 11:34:04 -04:00
40d40d67a3
Add changelog.
2023-06-02 17:09:58 +04:00
cbc5b8cebd
B Preload: Make sure that the preloaded json is html safe
2023-06-02 17:03:21 +04:00
e8d3525665
Merge branch 'bump-gettext' into 'develop'
...
mix: bump gettext to 0.22
See merge request pleroma/pleroma!3831
2023-06-02 01:38:41 +00:00
313e68c180
mix: bump gettext to ~0.20
...
Includes https://github.com/elixir-gettext/gettext/pull/304 in 0.20.0+
Includes https://github.com/elixir-gettext/expo/issues/91 in 0.22+ via expo 0.2.0+
2023-06-02 03:06:32 +02:00
e2a63dadd1
Merge branch 'test_improvement' into 'develop'
...
Use Phoenix.ConnTest.redirected_to/2
See merge request pleroma/pleroma!3899
2023-06-01 09:40:25 +00:00
c9cb90ff4f
Media proxy base URL doesn't need /proxy
2023-05-31 17:49:06 -06:00
Mark Felder
f0e5f0e837
Fix compile warning
...
warning: doing a prefix match with globs is deprecated, invalid segment "pleroma*path"
2023-05-31 22:23:36 +00:00
Mark Felder
2b8bbb288c
Phoenix.Socket.Transport.force_ssl/4 no longer exists
2023-05-31 22:11:17 +00:00
Mark Felder
d9f031c9da
Bump minimum Elixir to 1.12
2023-05-31 21:12:13 +00:00
Mark Felder
ba988a9abc
Fix test warnings
...
warning: the URI path used in plug tests must start with "/"
2023-05-31 16:30:31 -04:00
Mark Felder
62322f71e2
Clean up Plug.Parsers.MULTIPART deprecation warnings
...
There is no need to the length setting to :multipart. The length setting is global for all of the parsers.
2023-05-31 16:22:40 -04:00
Mark Felder
ffee478ed0
Move websocket config for Shoutbox to the Endpoint
...
This is the modern way of configuring it
2023-05-31 15:30:58 -04:00
Mark Felder
4dc2d4bf7b
Remove locked version of plug
...
Required for Phoenix 1.7 websocket changes
2023-05-31 15:30:31 -04:00
a2bbd7c9da
Fix base media and proxy URL in instructions to serve media on another domain
2023-05-31 12:22:13 -06:00
Mark Felder
a7e7db4a29
Phoenix.Endpoint.Cowboy2Handler -> Plug.Cowboy.Handler
2023-05-31 13:48:16 -04:00
Mark Felder
f622f82c0e
No user facing changes
2023-05-31 13:38:46 -04:00
Mark Felder
e3110cb34e
Fix deprecated calls to get_flash/2
2023-05-31 13:36:21 -04:00
Mark Felder
6e1ea2eafc
Remove unnecessary compilers as of Phoenix 1.7
2023-05-31 13:36:07 -04:00
Mark Felder
bed44f9f62
Update to Phoenix 1.7
...
Chase the other deps to match versions you get from a current "mix phx.new" project creation
2023-05-31 13:10:18 -04:00
Mark Felder
46c799f528
Use Phoenix.ConnTest.redirected_to/2
2023-05-31 09:54:37 -04:00
737e45c102
installation/debian_based_jp: Elixir 1.11 means Debian 12+ and Ubuntu 22.04+
...
I checked for what each part of the debian&ubuntu sentences meant with the
help of Jisho.org, should be safe but it did make me notice that this guide
hasn't been updated in years
2023-05-31 08:32:58 +02:00
8336519f30
installation/debian_based_en: Elixir 1.11 means Debian 12+ and Ubuntu 22.04+
2023-05-31 08:32:58 +02:00
d998a114e2
Merge branch 'validate-host' into 'develop'
...
Validate Host header for MediaProxy and Uploads
See merge request pleroma/pleroma!3896
2023-05-31 00:50:01 +00:00
Mark Felder
b3c3bd99c3
Switch from serving a 400 to a 302
2023-05-30 16:56:09 -04:00
da6b4003ac
Merge branch 'only_media_filter' into 'develop'
...
Add OnlyMedia Upload Filter
See merge request pleroma/pleroma!3897
2023-05-30 08:04:23 +00:00
Mark Felder
50a20f3bbd
Esacpe the asterisks in Markdown
2023-05-29 15:53:16 -04:00
Mark Felder
9caa0b0be1
Add OnlyMedia Upload Filter to simplify restricting uploads to audio, image, and video types
2023-05-29 15:49:04 -04:00
Mark Felder
da7394f33b
Fix unused assignment
2023-05-29 15:09:31 -04:00
Mark Felder
43bb2f39db
Remove unwanted parameter
2023-05-29 15:05:37 -04:00
lain
feld