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
tusooa
2736c3f294
Use --custom-platform to replace the deprecated one
2023-04-24 19:57:32 -04:00
tusooa
66d23713e9
Do not use nested levels for arch
2023-04-24 19:56:54 -04:00
duponin
af38c6104e
add changelog entry for BBS/SSH feature remove
2023-04-23 10:58:50 +02:00
duponin
b2dc9ad9d8
fix test after removing esshd/SSH feature
2023-04-23 10:47:17 +02:00
duponin
0231a09310
Remove SSH/BBS feature from core
...
And link to sshocial, the replacement client for this removed feature
2023-04-23 10:47:07 +02:00
tusooa
ae8f359f22
Skip changelog check for automated MRs
2023-04-22 21:07:18 -04:00
tusooa
30bc37c3ca
Explain changelog.d in merge request templates
2023-04-22 21:02:13 -04:00
tusooa
c1aa83069d
Skip changelog
2023-04-22 20:45:27 -04:00
tusooa
e13b331762
Fetch upstream in the repo
2023-04-22 20:42:59 -04:00
tusooa
50e237759a
Use git diff to search for changelog entry
2023-04-22 20:31:48 -04:00
Haelwenn (lanodan) Monnier
2148ef5e2f
UploadedMedia: Increase readability via ~s sigil
2023-04-18 00:12:42 +02: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
Haelwenn
3867b52aef
Merge branch 'tusooa/3027-dedupe-poll' into 'develop'
...
Dedupe poll options
Closes #3027
See merge request pleroma/pleroma!3860
2023-04-13 08:40:04 +00:00
Haelwenn
cf1ba77b9e
Merge branch '2023-04-mix-deps-update' into 'develop'
...
mix: Update all dependencies
See merge request pleroma/pleroma!3867
2023-04-13 08:36:35 +00:00
tusooa
23bca0c4b3
Skip changelog entry
2023-04-12 12:40:26 -04:00
tusooa
b37a90caa3
Combine images of different platforms into one
2023-04-12 12:38:47 -04:00
