lain
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
lain
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
Lain Soykaf
40d40d67a3
Add changelog.
2023-06-02 17:09:58 +04:00
Lain Soykaf
cbc5b8cebd
B Preload: Make sure that the preloaded json is html safe
2023-06-02 17:03:21 +04:00
Haelwenn
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
Haelwenn (lanodan) Monnier
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
Haelwenn
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
Mark Felder
46c799f528
Use Phoenix.ConnTest.redirected_to/2
2023-05-31 09:54:37 -04:00
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
8336519f30
installation/debian_based_en: Elixir 1.11 means Debian 12+ and Ubuntu 22.04+
2023-05-31 08:32:58 +02:00
Haelwenn
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
lain
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
Mark Felder
84974efe4c
Host header validation is now required for MediaProxy and Uploads
2023-05-29 14:17:27 -04:00
Mark Felder
a60dd0d92d
Validate Host header matches expected value before allowing access to Uploads
2023-05-29 14:16:03 -04:00
Mark Felder
843fcca5b4
Validate Host header matches expected value before allowing access to MediaProxy
2023-05-29 13:59:51 -04:00
Mark Felder
506a1c98e7
ConnCase: Make sure the host we use in tests is the actual Endpoint host
2023-05-29 13:55:48 -04:00
Haelwenn
31ec5cd35e
Merge branch 'mergeback/2.5.2' into 'develop'
...
Mergeback: 2.5.2
Closes #3030 , #3062 , and #3045
See merge request pleroma/pleroma!3893
2023-05-26 22:16:18 +00:00
Haelwenn (lanodan) Monnier
869f0d24a6
Merge branch 'release/2.5.2' into mergeback/2.5.2
2023-05-26 23:47:50 +02:00
Haelwenn
cd9d6a12ab
Merge branch 'issue/3126' into 'develop'
...
Filter OEmbed HTML tags
See merge request pleroma/pleroma!3891
2023-05-26 18:26:40 +00:00
Haelwenn (lanodan) Monnier
7618e562b3
Version 2.5.2
2023-05-26 19:57:00 +02:00
Mark Felder
4505bc1e58
Filter OEmbed HTML tags
2023-05-26 19:56:36 +02:00
Mark Felder
0d68804aa7
Filter OEmbed HTML tags
2023-05-26 19:54:24 +02:00
tusooa
d0c2e0830b
Enforce unauth restrictions for public streaming endpoints
2023-05-26 19:24:08 +02:00
Haelwenn
b36263e5ff
Merge branch 'issue/3126' into 'develop'
...
MediaProxyController: Apply CSP sandbox
See merge request pleroma/pleroma!3890
2023-05-26 19:24:08 +02:00
Haelwenn
4339230f64
Merge branch 'tusooa/fix-object-test' into 'develop'
...
Fix ObjectTest
See merge request pleroma/pleroma!3887
2023-05-26 19:24:08 +02:00
Haelwenn
72833c84b5
Merge branch 'tusooa/rework-refetch' into 'develop'
...
Make sure object refetching follows update rules
See merge request pleroma/pleroma!3883
2023-05-26 19:24:08 +02:00
Haelwenn
47e66c9500
Merge branch 'issue/3126' into 'develop'
...
MediaProxyController: Apply CSP sandbox
See merge request pleroma/pleroma!3890
2023-05-26 17:12:18 +00:00
Mark Felder
38bcf6b19e
MediaProxyController: Apply CSP sandbox
2023-05-26 12:34:01 -04:00
Haelwenn
5433742faf
Merge branch 'tusooa/fix-object-test' into 'develop'
...
Fix ObjectTest
See merge request pleroma/pleroma!3887
2023-05-23 01:57:07 +00:00
tusooa
819a82da99
Fix unused variable
2023-05-22 08:19:58 -04:00
tusooa
6aafa7fe76
Add changelog
2023-05-22 08:16:14 -04:00
tusooa
505e58d4eb
Fix ObjectTest
2023-05-22 08:14:20 -04:00
Haelwenn
0524e66a05
Merge branch 'accept-tags-2.5' into 'develop'
...
TagValidator: Drop unrecognized Tag types
Closes #2952
See merge request pleroma/pleroma!3823
2023-05-17 19:04:51 +00:00
Haelwenn
ce1c0f75cd
Merge branch 'tusooa/3065-scopes' into 'develop'
...
OAuth scopes descriptions
Closes #3065
See merge request pleroma/pleroma!3848
2023-05-17 18:51:26 +00:00
Haelwenn
66327b56e9
Merge branch 'tusooa/rework-refetch' into 'develop'
...
Make sure object refetching follows update rules
See merge request pleroma/pleroma!3883
2023-05-17 18:50:35 +00:00
Haelwenn
b8b15cec9e
Merge branch 'tusooa/changelog-improve' into 'develop'
...
Use git diff to search for changelog entry
See merge request pleroma/pleroma!3875
2023-05-17 15:49:54 +00:00
Haelwenn
143676f58c
Merge branch 'tusooa/allow-lang' into 'develop'
...
Allow lang attribute
See merge request pleroma/pleroma!3882
2023-05-17 15:28:32 +00:00
tusooa
e170fc40dd
Fix build warning
2023-05-09 21:38:28 -04:00
tusooa
be5c5118cb
Make sure object refetching follows update rules
2023-05-09 21:04:27 -04:00
tusooa
163e82bab1
Allow lang attribute
2023-05-09 19:27:32 -04:00
tusooa
6a3fd8e014
Do not count for renames when diffing
2023-05-02 22:16:00 -04:00
tusooa
99f157e280
Fix MR pipelines not having build and test jobs
2023-05-02 22:12:15 -04:00
tusooa
9283c784a3
Add English translation for oauth scopes
2023-05-02 17:03:09 -04:00
tusooa
b6dd194000
Add changelog
2023-05-02 16:33:53 -04:00
tusooa
6d0ebccdb0
Make webui use translated scope descriptions
2023-05-02 16:32:33 -04:00