mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-06-27 01:20:34 +00:00
Code Issues Projects Releases Wiki Activity
15350 commits 215 branches 57 tags 263 MiB
Commit graph

15350 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Haelwenn (lanodan) Monnier aa4c4ab2a0 mix: 2023-06 deps update 
this fixes compatibility with Erlang OTP 26

Related: https://git.pleroma.social/pleroma/pleroma/-/issues/2913
 2023-06-27 02:38:31 +02:00
Haelwenn (lanodan) Monnier 8bc51288be release_runtime_provider_test: Explicitely use non-existant config file 2023-06-27 00:20:29 +02:00
Haelwenn 4e26fbda08 Merge branch 'weblate-extract' into 'develop' 
Extract translatable strings

See merge request pleroma/pleroma!3871
 2023-06-22 19:40:18 +00:00
Haelwenn (lanodan) Monnier dd9f8150fc Merge Revert "Merge branch 'validate-host' into 'develop'" 
This reverts commit d998a114e2, reversing
changes made to da6b4003ac.
 2023-06-22 21:28:25 +02:00
Haelwenn 4367579949 Merge branch 'fix/bypass-authorized-fetch-mode-json' into 'develop' 
Prevent using a .json format to bypass authorized fetch mode

See merge request pleroma/pleroma!3908
 2023-06-22 10:35:56 +00:00
weblate-extractor 8bf8906045 Extract translatable strings 2023-06-22 06:09:47 +00:00
Sean King 994bfc4c09
Add changelog entry 2023-06-21 23:13:16 -06:00
Sean King a5a354a36e
Prevent bypassing authorized fetch mode with a json file 2023-06-21 23:10:56 -06:00
tusooa 8fa435f370 Add "potentially outdated" notice in non-English versions 2023-06-14 21:48:10 +00:00
Haelwenn (lanodan) Monnier 937fa36ec4 changelog.d/gentoo_otp.skip: Doc-only MR 2023-06-13 16:05:37 +02:00
Haelwenn (lanodan) Monnier eddfd41c1f gentoo_en: Reference packaged installation 2023-06-13 16:05:37 +02:00
Haelwenn (lanodan) Monnier fb19f0d844 gentoo_otp_en: Add packaged installation documentation 2023-06-13 16:05:37 +02:00
Haelwenn (lanodan) Monnier 4392fff212 otp_vs_from_source*: Acknowledge distro packages 2023-06-13 16:05:37 +02:00
Haelwenn (lanodan) Monnier d5a7079f42 media_graphics_packages.md: Fix markdown syntax 2023-06-13 15:44:29 +02:00
lain 589301ce06 Merge branch 'no_new_privs' into 'develop' 
Add no_new_privs to OpenRC service files

See merge request pleroma/pleroma!3905
 2023-06-13 13:34:21 +00:00
Haelwenn (lanodan) Monnier a663b73634 Add no_new_privs to OpenRC service files 2023-06-13 12:47:02 +02:00
lain fdb5bec431 Merge branch 'unused_indexes' into 'develop' 
Remove unused indexes

See merge request pleroma/pleroma!3874
 2023-06-11 19:48:23 +00:00
lain 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
lain 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
lain 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
Lain Soykaf 6611c6ce4e B ForceMentionsInContent: Fix test, refactor. 2023-06-11 16:45:31 +04:00
Lain Soykaf 55dd8ef1c7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-double_mentions 2023-06-11 16:31:20 +04:00
Lain Soykaf 22878cf84a B Migrations: Don't remove activity_visibility_index for now. 2023-06-11 16:22:16 +04:00
Lain Soykaf 10dfa107d5 Update changelog 2023-06-11 16:22:03 +04:00
Lain Soykaf 175ee9e6fe Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unused_indexes 2023-06-11 16:20:30 +04:00
lain 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
lain 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
lain 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
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
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
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
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
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
Sean King 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