Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Murazaki committed Nov 9, 2024
2 parents f424599 + 65dd601 commit 7d063f1
Show file tree
Hide file tree
Showing 44 changed files with 1,183 additions and 1,079 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release Notes

## [v0.12.3+glitch.1.6.0](https://github.com/pixelfed-glitch/pixelfed/compare/v0.12.3-glitch.1.5.0...v0.12.3-glitch.1.6.0)
## [v0.12.4+glitch.1.6.0](https://github.com/pixelfed-glitch/pixelfed/compare/v0.12.3-glitch.1.5.0...v0.12.4-glitch.1.6.0)

## Breaking Changes
- Dropping PHP 8.2 support in favor of 8.3
Expand Down Expand Up @@ -43,6 +43,7 @@
- Update config, allow Beagle discover service to be disabled ([de4ce3c8](https://github.com/pixelfed/pixelfed/commit/de4ce3c8))
- Update ApiV1Dot1Controller, allow upto 5 similar push tokens ([7820b506](https://github.com/pixelfed/pixelfed/commit/7820b506))
- Update AdminReports, add missing click handler. Fixes #5332 ([fe48b8ad](https://github.com/pixelfed/pixelfed/commit/fe48b8ad))
- Improve media filtering by using OffscreenCanvas, if supported ([aea5392](https://github.com/pixelfed/pixelfed/commit/aea5392))

## [v0.12.3+glitch.1.5.0](https://github.com/pixelfed-glitch/pixelfed/compare/v0.12.1-glitch.1.4.3...v0.12.3-glitch.1.5.0)

Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ COPY --link --from=composer-image /usr/bin/composer /usr/bin/composer
#! Changing user to runtime user
USER ${RUNTIME_UID}:${RUNTIME_GID}


# Install composer dependencies
# NOTE: we skip the autoloader generation here since we don't have all files avaliable (yet)
RUN --mount=type=cache,id=pixelfed-composer-${PHP_VERSION},sharing=locked,uid=${RUNTIME_UID},gid=${RUNTIME_GID},target=/cache/composer \
Expand Down
2 changes: 1 addition & 1 deletion config/pixelfed.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
| This value is the version of your Pixelfed instance.
|
*/
'version' => '0.12.3+glitch.1.5.0',
'version' => '0.12.4+glitch.1.6.0',

/*
|--------------------------------------------------------------------------
Expand Down
2,073 changes: 1,068 additions & 1,005 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pixelfed",
"private": true,
"version": "0.12.3+glitch.1.5.0",
"version": "0.12.4+glitch.1.6.0",
"scripts": {
"development": "mix",
"watch": "mix watch",
Expand Down
1 change: 0 additions & 1 deletion public/js/compose.chunk.18d0d2c9329a0322.js

This file was deleted.

2 changes: 2 additions & 0 deletions public/js/compose.chunk.d393814ebb56d367.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion public/js/compose.js

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/js/home.chunk.04307fd0fa9f4768.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
File renamed without changes.
2 changes: 1 addition & 1 deletion public/js/manifest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/js/post.chunk.d8c2d58580d0310f.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
File renamed without changes.
2 changes: 1 addition & 1 deletion public/js/vendor.js

Large diffs are not rendered by default.

62 changes: 31 additions & 31 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"/js/profile.js": "/js/profile.js?id=c207130ea4ca11e2c38cb5c95c362bf9",
"/js/status.js": "/js/status.js?id=ab8db98a6f8c88d0aa44761303835c00",
"/js/timeline.js": "/js/timeline.js?id=5b9c333a1260e18d717e07d6600f499a",
"/js/compose.js": "/js/compose.js?id=5d33cb0795e845a82e6b33d18d6fd0a5",
"/js/compose.js": "/js/compose.js?id=7b916f1a8cc374daccbd6bf14acd3196",
"/js/compose-classic.js": "/js/compose-classic.js?id=25300467f8cc5d0cf48353ad2a15f9b6",
"/js/search.js": "/js/search.js?id=63cf7a7bafc600cdfe5d7bdebfaa76f7",
"/js/developers.js": "/js/developers.js?id=4de04f01dea35c4958fb820647e6496d",
Expand All @@ -27,41 +27,41 @@
"/js/groups.js": "/js/groups.js?id=f34a0c482adfc25f4399cf9e47c899f2",
"/js/group-status.js": "/js/group-status.js?id=a1e47d8989344c4750fb7658d548de65",
"/js/group-topic-feed.js": "/js/group-topic-feed.js?id=16fa7d88f104424ad33c244af6cf5d77",
"/js/manifest.js": "/js/manifest.js?id=6f7cb7d7df6b972fb4795f4f66fb2193",
"/js/home.chunk.74df1b0b24f50447.js": "/js/home.chunk.74df1b0b24f50447.js?id=3653443248401abade86c34b94c85fe5",
"/js/compose.chunk.18d0d2c9329a0322.js": "/js/compose.chunk.18d0d2c9329a0322.js?id=d363500248d593db799649aa782516bc",
"/js/post.chunk.c6aac33a77fee858.js": "/js/post.chunk.c6aac33a77fee858.js?id=62b36694128b6435063ddb848e58fef7",
"/js/profile.chunk.e547412d6ced9fc8.js": "/js/profile.chunk.e547412d6ced9fc8.js?id=2486af4ac742c31faade375e45e7582f",
"/js/discover~memories.chunk.7407a530ede63e5c.js": "/js/discover~memories.chunk.7407a530ede63e5c.js?id=784bfaa27126136ac6f2d50ed202aafa",
"/js/discover~myhashtags.chunk.688b9e0445895036.js": "/js/discover~myhashtags.chunk.688b9e0445895036.js?id=fdbadd9b4cc1ab7d2352370d715fda37",
"/js/daci.chunk.aaddbf102fd88dda.js": "/js/daci.chunk.aaddbf102fd88dda.js?id=cc583c1a2426356897f0ad746bedb473",
"/js/discover~findfriends.chunk.faa74b8c39483910.js": "/js/discover~findfriends.chunk.faa74b8c39483910.js?id=e21d9c0940d8f7732f4a453828e55e28",
"/js/discover~serverfeed.chunk.8933eca11d52b1c7.js": "/js/discover~serverfeed.chunk.8933eca11d52b1c7.js?id=290eefddecaa618968226f713955a8e9",
"/js/discover~settings.chunk.437c538518789d13.js": "/js/discover~settings.chunk.437c538518789d13.js?id=ff517df69380ef3b2f5ec4347c388f62",
"/js/discover.chunk.ad2d22914f76f98d.js": "/js/discover.chunk.ad2d22914f76f98d.js?id=983a57f838885215a1d2816ab44302bf",
"/js/notifications.chunk.08cc93cf6a580436.js": "/js/notifications.chunk.08cc93cf6a580436.js?id=c3af42017508e0748c82e74570f42ece",
"/js/dms.chunk.5e01e731d41da8ff.js": "/js/dms.chunk.5e01e731d41da8ff.js?id=1f164a99e46d962d7465c0e429b37257",
"/js/dms~message.chunk.4b654813b692bdd1.js": "/js/dms~message.chunk.4b654813b692bdd1.js?id=b45d91904a15817578b325296cbe255f",
"/js/profile~followers.bundle.fa171ea239061d55.js": "/js/profile~followers.bundle.fa171ea239061d55.js?id=ae2d400c3bcf480686ecbf90ef4a66ed",
"/js/profile~following.bundle.7a592645bb9eb11f.js": "/js/profile~following.bundle.7a592645bb9eb11f.js?id=3956330a33e993d1c7259b679f5953b5",
"/js/discover~hashtag.bundle.0ce4b9f6a997b247.js": "/js/discover~hashtag.bundle.0ce4b9f6a997b247.js?id=71561da8665c864dfc652cafde113dd2",
"/js/error404.bundle.9200c0b8734654fb.js": "/js/error404.bundle.9200c0b8734654fb.js?id=5ed4f77d9dce508677d90200fb9e81cd",
"/js/i18n.bundle.5836ac15c1ff90be.js": "/js/i18n.bundle.5836ac15c1ff90be.js?id=47f2363eba830096435ff709a290c08c",
"/js/changelog.bundle.19b17ff9d833633c.js": "/js/changelog.bundle.19b17ff9d833633c.js?id=4982a09bba4eea394d05b50e3f1c1060",
"/js/group.create.de529f4f8234080a.js": "/js/group.create.de529f4f8234080a.js?id=ace358ecc90f0be7eaf97994cd058578",
"/js/groups-post.89ef401bc3e4338f.js": "/js/groups-post.89ef401bc3e4338f.js?id=a0288be80a4d17f5c966c71d6253f663",
"/js/groups-profile.2d5b53d784146dd1.js": "/js/groups-profile.2d5b53d784146dd1.js?id=399deea282e639d488852a4f2a7a6d8b",
"/js/groups-page-about.f104deafd36d2813.js": "/js/groups-page-about.f104deafd36d2813.js?id=d236c4c5ded0ab16516355ad812f43e0",
"/js/groups-page-topics.d51e24af2273e3c4.js": "/js/groups-page-topics.d51e24af2273e3c4.js?id=df82af62cf62ce5df4467ced6b5b0f6b",
"/js/groups-page-members.9e6e807b47585ba8.js": "/js/groups-page-members.9e6e807b47585ba8.js?id=66283477f45f98715dabab228b58a70b",
"/js/groups-page-media.660d310e20bb9451.js": "/js/groups-page-media.660d310e20bb9451.js?id=63ced28b7fed630b5557ed31936a5daa",
"/js/groups-page.acb1312c8fa28603.js": "/js/groups-page.acb1312c8fa28603.js?id=ca5e177a511b14de259003ad2f96ef47",
"/js/manifest.js": "/js/manifest.js?id=3061aee4fccecf7a11afd6b1fbf1267d",
"/js/home.chunk.04307fd0fa9f4768.js": "/js/home.chunk.04307fd0fa9f4768.js?id=404ff827b4fea0c8c4b3cb419a5d7be8",
"/js/compose.chunk.d393814ebb56d367.js": "/js/compose.chunk.d393814ebb56d367.js?id=728866e87afae3ae6693fd2956055eaf",
"/js/post.chunk.d8c2d58580d0310f.js": "/js/post.chunk.d8c2d58580d0310f.js?id=0916195d31e8ed3c28640d81b3840c11",
"/js/profile.chunk.96564eabebcc3a6d.js": "/js/profile.chunk.96564eabebcc3a6d.js?id=2486af4ac742c31faade375e45e7582f",
"/js/discover~memories.chunk.3df34e792a028d54.js": "/js/discover~memories.chunk.3df34e792a028d54.js?id=784bfaa27126136ac6f2d50ed202aafa",
"/js/discover~myhashtags.chunk.87014561ae588ba0.js": "/js/discover~myhashtags.chunk.87014561ae588ba0.js?id=fdbadd9b4cc1ab7d2352370d715fda37",
"/js/daci.chunk.3c48b7aa498cd22e.js": "/js/daci.chunk.3c48b7aa498cd22e.js?id=cc583c1a2426356897f0ad746bedb473",
"/js/discover~findfriends.chunk.466d23c515bf264d.js": "/js/discover~findfriends.chunk.466d23c515bf264d.js?id=e21d9c0940d8f7732f4a453828e55e28",
"/js/discover~serverfeed.chunk.aa0f352b6eaa49a0.js": "/js/discover~serverfeed.chunk.aa0f352b6eaa49a0.js?id=290eefddecaa618968226f713955a8e9",
"/js/discover~settings.chunk.be5c0a402ab7fa1e.js": "/js/discover~settings.chunk.be5c0a402ab7fa1e.js?id=ff517df69380ef3b2f5ec4347c388f62",
"/js/discover.chunk.4cb129856e2ddced.js": "/js/discover.chunk.4cb129856e2ddced.js?id=983a57f838885215a1d2816ab44302bf",
"/js/notifications.chunk.a7fbe6d49f082e33.js": "/js/notifications.chunk.a7fbe6d49f082e33.js?id=c3af42017508e0748c82e74570f42ece",
"/js/dms.chunk.4e798947f642868e.js": "/js/dms.chunk.4e798947f642868e.js?id=1f164a99e46d962d7465c0e429b37257",
"/js/dms~message.chunk.76dbb3a89d2fbdb3.js": "/js/dms~message.chunk.76dbb3a89d2fbdb3.js?id=b45d91904a15817578b325296cbe255f",
"/js/profile~followers.bundle.f26ee6ed6ced9aa7.js": "/js/profile~followers.bundle.f26ee6ed6ced9aa7.js?id=ae2d400c3bcf480686ecbf90ef4a66ed",
"/js/profile~following.bundle.4ac5466dca6ca1c4.js": "/js/profile~following.bundle.4ac5466dca6ca1c4.js?id=3956330a33e993d1c7259b679f5953b5",
"/js/discover~hashtag.bundle.24ea4814ca8996f1.js": "/js/discover~hashtag.bundle.24ea4814ca8996f1.js?id=71561da8665c864dfc652cafde113dd2",
"/js/error404.bundle.ad885ef6f9b2c101.js": "/js/error404.bundle.ad885ef6f9b2c101.js?id=5ed4f77d9dce508677d90200fb9e81cd",
"/js/i18n.bundle.0be1fd22cdc53280.js": "/js/i18n.bundle.0be1fd22cdc53280.js?id=47f2363eba830096435ff709a290c08c",
"/js/changelog.bundle.c0d13428ba7ff9a9.js": "/js/changelog.bundle.c0d13428ba7ff9a9.js?id=4982a09bba4eea394d05b50e3f1c1060",
"/js/group.create.d0fba181dd767981.js": "/js/group.create.d0fba181dd767981.js?id=ace358ecc90f0be7eaf97994cd058578",
"/js/groups-post.639cb121bdc6f4a7.js": "/js/groups-post.639cb121bdc6f4a7.js?id=a0288be80a4d17f5c966c71d6253f663",
"/js/groups-profile.3b11ffa46ae76520.js": "/js/groups-profile.3b11ffa46ae76520.js?id=399deea282e639d488852a4f2a7a6d8b",
"/js/groups-page-about.06576420562628e3.js": "/js/groups-page-about.06576420562628e3.js?id=d236c4c5ded0ab16516355ad812f43e0",
"/js/groups-page-topics.431ebaf843ca9b16.js": "/js/groups-page-topics.431ebaf843ca9b16.js?id=df82af62cf62ce5df4467ced6b5b0f6b",
"/js/groups-page-members.bfdefdd66058e838.js": "/js/groups-page-members.bfdefdd66058e838.js?id=66283477f45f98715dabab228b58a70b",
"/js/groups-page-media.f611a51e684c48ef.js": "/js/groups-page-media.f611a51e684c48ef.js?id=63ced28b7fed630b5557ed31936a5daa",
"/js/groups-page.53eccead9512c61f.js": "/js/groups-page.53eccead9512c61f.js?id=ca5e177a511b14de259003ad2f96ef47",
"/css/appdark.css": "/css/appdark.css?id=3cbc92b4784f57c91681c8a7ede0db5f",
"/css/app.css": "/css/app.css?id=e10a6f66100a7c9bc1facc89f655de0a",
"/css/portfolio.css": "/css/portfolio.css?id=d98e354f173c6a8b729626384dceaa90",
"/css/admin.css": "/css/admin.css?id=20cdb9cce61b0e1bd9fb1aad30efcd2f",
"/css/landing.css": "/css/landing.css?id=b6e73c3924453e3053aff7d192895d8c",
"/css/profile.css": "/css/profile.css?id=ae4f5db9bb1a89db2ae293d6bde812e3",
"/css/spa.css": "/css/spa.css?id=041aed9a146db0e74b2cfe3ad8eaf96c",
"/js/vendor.js": "/js/vendor.js?id=24e1b4f4cacf0fc15913a0495cfc5add"
"/js/vendor.js": "/js/vendor.js?id=00be108c117e66530a30596741ebf11e"
}
Loading

0 comments on commit 7d063f1

Please sign in to comment.