Fixing links and references to docker images

.env.docker

@@ -1006,6 +1006,8 @@ DOCKER_APP_BASE_TYPE="apache"
 # Example values:
 #
 #   * "ghcr.io/pixelfed-glitch/pixelfed" to pull from GitHub
+#   * "pixelfedglitch/pixelfed"         to pull from DockerHub
+#   * "your/fork"                 to pull from a custom fork
 #
 # @dottie/validate required
 DOCKER_APP_IMAGE="ghcr.io/pixelfed-glitch/pixelfed"

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased](https://github.com/pixelfed/pixelfed-glitch/compare/v0.12.1-glitch.1.4.1...develop)
 
+### Updates
+
+- Added [Docker Hub repository](https://hub.docker.com/r/pixelfedglitch/pixelfed/)
+- Several fixes on docker build
+- Updated links on the app
+
 ### Updates (from Upstream)
 - Update ApiV1Controller, add pe (pixelfed entity) support to /api/v1/statuses/{id}/context endpoint ([d645d6ca](https://github.com/pixelfed/pixelfed/commit/d645d6ca))
 - Update Admin Curated Onboarding, add select-all/mass action operations ([b22cac94](https://github.com/pixelfed/pixelfed/commit/b22cac94))

CONTRIBUTING.md

@@ -1,22 +1,22 @@
 # Contributing
 
 ## Bug Reports
-To encourage active collaboration, Pixelfed strongly encourages pull requests, not just bug reports. "Bug reports" may also be sent in the form of a pull request containing a failing test.
+To encourage active collaboration, Pixelfed Glitch strongly encourages pull requests, not just bug reports. "Bug reports" may also be sent in the form of a pull request containing a failing test.
 
 However, if you file a bug report, your issue should contain a title and a clear description of the issue. You should also include as much relevant information as possible and a code sample that demonstrates the issue. The goal of a bug report is to make it easy for yourself - and others - to replicate the bug and develop a fix.
 
 Remember, bug reports are created in the hope that others with the same problem will be able to collaborate with you on solving it. Do not expect that the bug report will automatically see any activity or that others will jump to fix it. Creating a bug report serves to help yourself and others start on the path of fixing the problem.
 
 ## Core Development Discussion
-Informal discussion regarding bugs, new features, and implementation of existing features takes place in the ```#pixelfed-dev``` channel on the Freenode IRC network.
+Informal discussion regarding bugs, new features, and implementation of existing features takes place in the ```#feedback``` channel on the Discord server.
 
 ## Branches
-If you want to contribute to this repository, please file your pull request against the `staging` branch. 
+If you want to contribute to this repository, please file your pull request against the `develop` branch. 
 
-Pixelfed Beta currently uses the `dev` branch for deployable code. When v1.0 is released, the stable branch will be changed to `master`, with `dev` branch being used for development and testing.
+Pixelfed Glitch currently uses the `main` branch for deployable code.
 
 ## Compiled Assets
-If you are submitting a change that will affect a compiled file, such as most of the files in ```resources/assets/sass``` or ```resources/assets/js``` of the pixelfed-glitch/pixelfed repository, do not commit the compiled files. Due to their large size, they cannot realistically be reviewed by a maintainer. This could be exploited as a way to inject malicious code into Pixelfed. In order to defensively prevent this, all compiled files will be generated and committed by Pixelfed maintainers.
+If you are submitting a change that will affect a compiled file, such as most of the files in ```resources/assets/sass``` or ```resources/assets/js``` of the pixelfed-glitch/pixelfed repository, do not commit the compiled files. Due to their large size, they cannot realistically be reviewed by a maintainer. This could be exploited as a way to inject malicious code into Pixelfed. In order to defensively prevent this, all compiled files will be generated and committed by Pixelfed Glitch maintainers.
 
 ## Security Vulnerabilities
-If you discover a security vulnerability within Pixelfed, please send an email to Daniel Supernault at [email protected]. All security vulnerabilities will be promptly addressed.
+If you discover a security vulnerability within Pixelfed Glitch, please send an email to Mehdi Benadel at [email protected]. All security vulnerabilities will be promptly addressed.

README.md

@@ -34,6 +34,6 @@ Pixelfed and Pixelfed Glitch are open-sourced software licensed under the AGPL l
 
 ## Communication
 
-Maintainer : @Murazaki (@[email protected])
+Maintainer : @Murazaki ([@[email protected]](https://mastodon.balamb.fr/@mehdi_benadel))
 
-Discord Server : https://discord.gg/qbSsr5pa
+Discord Server : [Pixelfed Glitch Discord](https://discord.gg/HuZc6jr25X)

app/Util/Site/Nodeinfo.php

@@ -31,7 +31,7 @@ public static function get()
                 'metadata' => [
                     'nodeName' => config_cache('app.name'),
                     'software' => [
-                        'homepage'  => 'https://pixelfed.org',
+                        'homepage'  => 'https://pixelfed-glitch.github.io/docs',
                         'repo'      => 'https://github.com/pixelfed-glitch/pixelfed',
                     ],
                     'config' => $features

resources/assets/components/Changelog.vue

@@ -86,7 +86,7 @@
 
 					<div class="pb-3">
 						<p class="lead">Older</p>
-						<p>To view the full list of changes, view the project changelog <a href="https://raw.githubusercontent.com/pixelfed/pixelfed/dev/CHANGELOG.md">here</a>.</p>
+						<p>To view the full list of changes, view the project changelog <a href="https://raw.githubusercontent.com/pixelfed-glitch/pixelfed/develop/CHANGELOG.md">here</a>.</p>
 					</div>
 				</div>
 

resources/assets/components/Home.vue

@@ -41,7 +41,7 @@
 
                                         <div>
                                             <h1 class="h3 font-weight-bold text-light mb-1">Software Update Check Failed</h1>
-                                            <p class="mb-1 text-white" style="font-size:18px;line-height: 1.2;">We attempted to check if there is a new version available, however we encountered an error. <a href="https://github.com/pixelfed/pixelfed/releases" class="text-white font-weight-bold" style="text-decoration: underline;" target="_blank">Click here</a> to view the latest releases.</p>
+                                            <p class="mb-1 text-white" style="font-size:18px;line-height: 1.2;">We attempted to check if there is a new version available, however we encountered an error. <a href="https://github.com/pixelfed-glitch/pixelfed/releases" class="text-white font-weight-bold" style="text-decoration: underline;" target="_blank">Click here</a> to view the latest releases.</p>
                                             <p class="mb-0 text-white small">You can set <code class="text-white">INSTANCE_SOFTWARE_UPDATE_DISABLE_FAILED_WARNING=true</code> to remove this warning.</p>
                                             <p class="mb-0 text-white small" style="opacity:.7">Current version: {{ updateInfo?.current ?? 'Unknown' }}</p>
                                         </div>

resources/views/site/opensource.blade.php

@@ -7,10 +7,10 @@
   </div>
   <hr>
   <section>
-    <p class="lead">The software that powers this website is called <a href="https://pixelfed-glitch.github.io/docs/">Pixelfed Glitch</a> and anyone can <a href="https://github.com/pixelfed-glitch/pixelfed">download</a> or <a href="https://github.com/pixelfed-glitch/pixelfed">view</a> the source code and run their own instance!</p>
+    <p class="lead">The software that powers this website is called <a href="https://github.com/pixelfed-glitch/pixelfed">Pixelfed Glitch</a> and anyone can <a href="https://github.com/pixelfed-glitch/pixelfed">download</a> or <a href="https://github.com/pixelfed-glitch/pixelfed">view</a> the source code and run their own instance!</p>
   </section>
 @endsection
 
 @push('meta')
-<meta property="og:description" content="Open source in Pixelfed">
+<meta property="og:description" content="Open source in Pixelfed Glitch">
 @endpush