tarrien/Mastodon

T

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

Update libretranslate/libretranslate Docker tag to v1.3.11 (#25428 )

2023-06-14 18:15:32 +02:00

Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream

2023-06-10 16:48:01 +02:00

…

Merge branch 'main' into glitch-soc/merge-upstream

2023-06-18 16:14:29 +02:00

Move the mastodon/*_cli files to mastodon/cli/* (#24139 )

2023-05-23 16:08:26 +02:00

…

Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream

2023-06-18 13:41:33 +02:00

Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream

2023-06-10 18:42:29 +02:00

…

Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream

2023-06-18 10:36:14 +02:00

Initial commit

2016-02-20 22:53:20 +01:00

…

Fix glitch-soc-only test being broken by refactor of the surrounding tests

2023-06-18 13:59:47 +02:00

Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream

2023-06-18 10:36:14 +02:00

…

.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

Add .gitattributes file to avoid unwanted CRLF (#3954 )

2017-06-26 13:15:24 +02:00

.gitignore

…

.gitmodules

…

.haml-lint_todo.yml

…

.haml-lint.yml

Consistently use middle dot (·) instead of bullet (•) to separate items (#25248 )

2023-06-02 19:58:18 +02:00

.nanoignore

…

.nvmrc

…

.prettierignore

Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream

2023-06-10 15:32:29 +02:00

.prettierrc.js

Use Prettier for ESLint formatting TypeScript (#23631 )

2023-05-09 19:02:12 +02:00

.profile

…

.rspec

…

.rubocop_todo.yml

Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream

2023-06-18 13:41:33 +02:00

.rubocop.yml

Consistently use middle dot (·) instead of bullet (•) to separate items (#25248 )

2023-06-02 19:58:18 +02:00

.ruby-gemset

…

.ruby-version

Bump ruby to 3.2.2 due to ReDoS vulnerabilities (#24320 )

2023-03-31 18:28:40 +02:00

.slugignore

…

.yarnclean

…

app.json

…

Aptfile

Make it possible to upload audio and video to Heroku app (#24866 )

2023-05-05 14:41:07 +02:00

AUTHORS.md

…

babel.config.js

Update babel monorepo to v7.22.5 (#25405 )

2023-06-14 09:22:54 +02:00

Capfile

…

CHANGELOG.md

…

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

…

crowdin-glitch.yml

…

crowdin.yml

…

docker-compose.yml

…

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

ide-helper.js

…

jest.config.js

Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream

2023-06-10 15:32:29 +02:00

jsconfig.json

…

LICENSE

…

package.json

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

2023-06-10 16:22:14 +02:00

postcss.config.js

…

priv-config

…

Procfile

fix: make Procfile compatible with herokuish (#12685 )

2020-08-29 19:00:30 +02:00

Procfile.dev

…

Rakefile

…

README.md

…

scalingo.json

…

SECURITY.md

…

stylelint.config.js

…

tsconfig.json

Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream

2023-05-28 13:55:30 +02:00

Vagrantfile

…

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!

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?

You can view documentation for this project at glitch-soc.github.io/docs/.
And contributing guidelines are available here and here.

Languages

Ruby 57.6%

JavaScript 26.6%

SCSS 10%

Haml 5.5%

HTML 0.2%