The glaceon.social flavour of glitch-soc, a Mastodon fork
Go to file
Claire dc68306b8e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
2023-06-18 16:14:29 +02:00
.devcontainer Update libretranslate/libretranslate Docker tag to v1.3.11 (#25428) 2023-06-14 18:15:32 +02:00
.github Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
.husky
…
app Merge branch 'main' into glitch-soc/merge-upstream 2023-06-18 16:14:29 +02:00
bin Move the mastodon/*_cli files to mastodon/cli/* (#24139) 2023-05-23 16:08:26 +02:00
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
config Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 2023-06-18 13:41:33 +02:00
db Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream 2023-06-10 18:42:29 +02:00
dist Remove clustering from streaming API (#24655) 2023-04-26 11:37:51 +02:00
lib Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
log
…
public
…
spec Fix glitch-soc-only test being broken by refactor of the surrounding tests 2023-06-18 13:59:47 +02:00
streaming Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
vendor
…
.browserslistrc
…
.buildpacks
…
.bundler-audit.yml
…
.dockerignore
…
.editorconfig
…
.env.production.sample
…
.env.test
…
.env.vagrant
…
.eslintignore
…
.eslintrc.js Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
.foreman
…
.gitattributes
…
.gitignore
…
.gitmodules
…
.haml-lint.yml Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
.haml-lint_todo.yml
…
.nanoignore
…
.nvmrc
…
.prettierignore Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
.prettierrc.js
…
.profile
…
.rspec
…
.rubocop.yml Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
.rubocop_todo.yml Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 2023-06-18 13:41:33 +02:00
.ruby-gemset
…
.ruby-version
…
.slugignore
…
.yarnclean
…
AUTHORS.md
…
Aptfile
…
CHANGELOG.md
…
CODE_OF_CONDUCT.md
…
CONTRIBUTING.md
…
Capfile
…
Dockerfile Fix minor typos in comments and spec names (#21831) 2023-05-19 17:13:29 +02:00
FEDERATION.md
…
Gemfile Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
Gemfile.lock Update dependency aws-sdk-s3 to v1.125.0 (#25458) 2023-06-16 14:23:58 +02:00
LICENSE
…
Procfile
…
Procfile.dev
…
README.md
…
Rakefile
…
SECURITY.md
…
Vagrantfile
…
app.json
…
babel.config.js Update babel monorepo to v7.22.5 (#25405) 2023-06-14 09:22:54 +02:00
config.ru
…
crowdin-glitch.yml
…
crowdin.yml
…
docker-compose.yml
…
ide-helper.js
…
jest.config.js Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
jsconfig.json
…
package.json Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
postcss.config.js
…
priv-config
…
scalingo.json
…
stylelint.config.js
…
tsconfig.json Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream 2023-05-28 13:55:30 +02:00
yarn.lock Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 2023-06-18 13:41:33 +02:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?