Commit graph

25 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier
869f0d24a6 Merge branch 'release/2.5.2' into mergeback/2.5.2 2023-05-26 23:47:50 +02:00
4505bc1e58 Filter OEmbed HTML tags 2023-05-26 19:56:36 +02:00
0d68804aa7 Filter OEmbed HTML tags 2023-05-26 19:54:24 +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
38bcf6b19e MediaProxyController: Apply CSP sandbox 2023-05-26 12:34:01 -04:00
tusooa
6aafa7fe76
Add changelog 2023-05-22 08:16:14 -04: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
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
b6dd194000
Add changelog 2023-05-02 16:33:53 -04:00
tusooa
ddf57596be Merge branch 'bugfix/content-disposition' into 'develop'
UploadedMedia: Add missing disposition_type to Content-Disposition

Closes #3114

See merge request pleroma/pleroma!3873
2023-04-26 15:39:20 +00:00
tusooa
d5e8345946
Do not use needs: in pipeline yaml 2023-04-26 09:14:49 -04:00
lain
d97425d49e Merge branch 'duponin/remove-ssh' into 'develop'
Remove SSH/BBS feature from core

Closes #932, #2389, and #2931

See merge request pleroma/pleroma!3872
2023-04-26 12:19:46 +00:00
tusooa
1a50db36d3
Skip changelog entry for 3877 2023-04-26 07:20:35 -04:00
tusooa
47e95fe9f5
Add changelog for 3876 2023-04-25 21:40:28 -04:00
duponin
af38c6104e add changelog entry for BBS/SSH feature remove 2023-04-23 10:58:50 +02:00
tusooa
c1aa83069d
Skip changelog 2023-04-22 20:45:27 -04:00
Haelwenn (lanodan) Monnier
8f0f58e28b UploadedMedia: Add missing disposition_type to Content-Disposition
Set it to `inline` because the vast majority of what's sent is multimedia
content while `attachment` would have the side-effect of triggering a
download dialog.

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3114
2023-04-18 00:09:19 +02:00
tusooa
23bca0c4b3
Skip changelog entry 2023-04-12 12:40:26 -04:00
Tusooa Zhu
d3871fa360
Allow to explicitly skip changelog 2022-08-28 09:57:32 -04:00