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 |
|
tusooa
|
530284e1b9
|
Add extracted pot
|
2023-05-02 16:32:33 -04:00 |
|
tusooa
|
85bdbb102e
|
Add extraction process for oauth scopes
|
2023-05-02 16:32:10 -04:00 |
|
tusooa
|
248f914e6e
|
Merge branch 'list-installed-frontends' into 'develop'
List installed frontend refs in admin API
See merge request pleroma/pleroma!3862
|
2023-04-27 02:56:19 +00: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 |
|
Haelwenn
|
286b9bb66c
|
Merge branch 'tusooa/no-more-needs' into 'develop'
Do not use needs: in pipeline yaml
See merge request pleroma/pleroma!3878
|
2023-04-26 14:23:47 +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 |
|
Haelwenn
|
18913c4cd8
|
Merge branch 'tusooa/combine-login' into 'develop'
Work around docker login needing daemon
See merge request pleroma/pleroma!3877
|
2023-04-26 11:43:46 +00:00 |
|
tusooa
|
1a50db36d3
|
Skip changelog entry for 3877
|
2023-04-26 07:20:35 -04:00 |
|
tusooa
|
a946917206
|
Work around docker login needing daemon
|
2023-04-26 07:19:30 -04:00 |
|
Haelwenn
|
3b2d7cc67f
|
Merge branch 'tusooa/kaniko' into 'develop'
Add ELIXIR_IMG arg to latest
See merge request pleroma/pleroma!3876
|
2023-04-26 02:59:13 +00:00 |
|
tusooa
|
47e95fe9f5
|
Add changelog for 3876
|
2023-04-25 21:40:28 -04:00 |
|
tusooa
|
9c7b036401
|
Add ELIXIR_IMG arg to latest
|
2023-04-25 21:39:15 -04:00 |
|
Haelwenn
|
6bd0df1357
|
Merge branch 'tusooa/kaniko' into 'develop'
Use kaniko to build docker images
See merge request pleroma/pleroma!3870
|
2023-04-25 23:14:21 +00:00 |
|
tusooa
|
c5ffdd0609
|
Use self-built elixir image for arm
|
2023-04-24 20:03:59 -04:00 |
|