Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream changes #40

Merged
merged 48 commits into from
Feb 4, 2025
Merged

Upstream changes #40

merged 48 commits into from
Feb 4, 2025

Conversation

Murazaki
Copy link

No description provided.

Simon-Laux and others added 30 commits January 24, 2025 21:29
* add kickstarter and monthly users badge (#5589)

Co-authored-by: daniel <[email protected]>

* DM

---------

Co-authored-by: Simon Laux <[email protected]>
* Fix the local column for statuses to not include remote shares

* Chunk the migration
* add kickstarter and monthly users badge (#5589)

Co-authored-by: daniel <[email protected]>

* DM

* Fix the local column for statuses to not include remote shares (#5513)

* Fix the local column for statuses to not include remote shares

* Chunk the migration

* Refactor migration

---------

Co-authored-by: Simon Laux <[email protected]>
Co-authored-by: Anil Kulkarni <[email protected]>
* add kickstarter and monthly users badge (#5589)

Co-authored-by: daniel <[email protected]>

* DM

* Fix the local column for statuses to not include remote shares (#5513)

* Fix the local column for statuses to not include remote shares

* Chunk the migration

* Refactor migration

* Fix GroupController, move groups enabled check to each method to fix route:list

* Update changelog

---------

Co-authored-by: Simon Laux <[email protected]>
Co-authored-by: Anil Kulkarni <[email protected]>
rm-yakovenko and others added 18 commits February 2, 2025 13:48
migrate2cloud fails on media without thumbnail.
fix check for existing thumbnail, skip upload if none exists.
Update ApiV1Controller.php
FILTER_SANITIZE_STRING filter was deprecated in PHP 8.1.0. Use htmlspecialchars()
Fix #5619 - Dupe method handleBookmark
use config_cache for max_caption_length
AdminStatsService: do not count deleted users
Skip thumbnail cloud upload if no thumbnail exists
* Update .env.docker

Registry has changed. Old registry has been discontinued in August 2024. New Registry added, format of Docker tag has been adjusted as it now contains the Debian Release as well.

Sample Version is set to current stable but can be adjusted to any of the available branches.

* Update .env.docker

Stick major.minor according to https://jippi.github.io/docker-pixelfed/customize/tags/#pixelfed-version

Disable Debian Release Check until it's solved in dottie.

Closes #5264

* New translations web.php (Finnish)
[ci skip]

* New translations web.php (Finnish)
[ci skip]

* fix: don't restore memory limit after cities import

Since this command can only be invoked by CLI, the process will exit after a successful import, so restoring the transient PHP memory limit doesn't really have any affect.

In PHP 8.4, this throws the following error (which doesn't happen in 8.3 and below)

> [entrypoint / 11-first-time-setup.sh] - (stderr) 128769/128769 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%[2025-01-20 11:29:23] production.ERROR: Failed to set memory limit to 134217728 bytes (Current memory usage is 134746112 bytes) {"exception":"[object] (ErrorException(code: 0): Failed to set memory limit to 134217728 bytes (Current memory usage is 134746112 bytes) at /var/www/app/Console/Commands/ImportCities.php:140)

It seems to be a 8.4 behavior change, so removing the logic would make it go away

* New translations web.php (Finnish)
[ci skip]

* New translations web.php (Finnish)
[ci skip]

* New translations web.php (Portuguese)
[ci skip]

* New translations web.php (Portuguese)
[ci skip]

* fix(compose-modal): avoid WebGL if it's not needed

* fix(compose-modal): update webgl-media-editor

* New translations web.php (Hungarian)
[ci skip]

* New translations web.php (Russian)
[ci skip]

* New translations web.php (Russian)
[ci skip]

* Update .env.example

Adding the parameter INSTANCE_DISCOVER_PUBLIC="true" to prevent a HTTP 403 error at the explorer tab in the instance preview.

* New variable for lang spanish

* Variable for lang spanish

* Update Dockerfile, fixes #5535 #5559

* Fix #5582

* Fix #5632

* Update status twitter:card to summary_large_image for images/albums

* Update changelog

---------

Co-authored-by: Lioh Moeller <[email protected]>
Co-authored-by: Christian Winther <[email protected]>
Co-authored-by: Taye Adeyemi <[email protected]>
Co-authored-by: stemy2 <[email protected]>
Co-authored-by: Uthanien <[email protected]>
@Murazaki Murazaki merged commit af551bf into pixelfed-glitch:develop Feb 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants