tarrien/Mastodon

Go to file

Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.

2022-11-06 09:50:41 +01:00

Revamp post filtering system (#18058 )

2022-06-28 09:42:13 +02:00

Fix auto detect language for translate service (#19244 )

2022-09-27 23:33:56 +02:00

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

2022-11-06 09:50:41 +01:00

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

2022-11-06 09:50:41 +01:00

Update Mastodon to Rails 6.1 (#15910 )

2021-03-24 10:44:31 +01:00

helm: Add documentation to run tootctl commands (#19791 )

2022-11-05 21:19:25 +01:00

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

2022-11-06 09:50:41 +01:00

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

2022-11-06 09:50:41 +01:00

nginx: optimize locations (#19438 )

2022-10-29 15:06:23 +02:00

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

2022-11-06 09:50:41 +01:00

…

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

2022-11-06 09:50:41 +01:00

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

2022-11-06 09:50:41 +01:00

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

2022-07-17 22:07:20 +02:00

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.browserslistrc

Add ES6 compatibility to browserslist (#18519 )

2022-05-26 20:29:28 +02:00

.buildpacks

Remove nodejs buildpack from buildpacks (#14364 )

2020-07-20 09:48:10 +02:00

.codeclimate.yml

Replace from Code Climate to Super-Linter (#18587 )

2022-06-01 19:22:35 +02:00

.deepsource.toml

Update .deepsource.toml (#15753 )

2021-02-19 09:53:25 +01:00

.dockerignore

Update .dockerignore/.gitignore for #16947 etc (#17099 )

2021-12-06 18:04:04 +01:00

.editorconfig

…

.env.production.sample

Allow number of trending hashtags to be customizable (#1884 )

2022-11-02 09:20:47 +01:00

.env.test

Bump webpacker from 4.0.7 to 4.2.0 (#12416 )

2019-11-20 17:56:11 +01:00

.env.vagrant

Add a default DB_HOST to .env.vagrant for enable the streaming (#14030 )

2020-06-15 01:57:06 +02:00

.eslintignore

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.eslintrc.js

Replace from Code Climate to Super-Linter (#18587 )

2022-06-01 19:22:35 +02:00

.foreman

…

.gitattributes

…

.gitignore

Update .dockerignore/.gitignore for #16947 etc (#17099 )

2021-12-06 18:04:04 +01:00

.gitmodules

Rename themes -> flavours ? ?

2017-12-03 23:26:40 -08:00

.haml-lint.yml

…

.nanoignore

…

.nvmrc

NodeJS 14 support - circleci/docker/.nvmrc (#16163 )

2021-08-10 22:56:13 +02:00

.prettierignore

Format JSON and YAML using Prettier (#17823 )

2022-03-21 04:46:11 +01:00

.prettierrc.js

Format JSON and YAML using Prettier (#17823 )

2022-03-21 04:46:11 +01:00

.profile

…

.rspec

…

.rubocop.yml

Add customizable user roles (#18641 )

2022-07-05 02:41:40 +02:00

.ruby-gemset

Make Mastodon use its own gemset (#17858 )

2022-08-13 15:44:34 +02:00

.ruby-version

Bump Ruby version from 3.0.3 to 3.0.4 (#18028 )

2022-08-15 04:39:58 +02:00

.slugignore

…

.yarnclean

Replace from scss-lint to sass-lint (#10958 )

2019-06-04 17:23:18 +02:00

app.json

Format JSON and YAML using Prettier (#17823 )

2022-03-21 04:46:11 +01:00

Aptfile

Heroku fix (#19807 )

2022-11-05 22:57:58 +01:00

AUTHORS.md

Bump version to 3.5.0rc1 (#17618 )

2022-03-15 08:16:45 +01:00

babel.config.js

Remove dependency for @babel/plugin-proposal-class-properties (#16155 )

2021-05-04 23:13:04 +02:00

Capfile

…

CHANGELOG.md

Update changelog for 4.0.0rc1 (#19814 )

2022-11-05 23:24:07 +01:00

CODE_OF_CONDUCT.md

Change e-mail contact for CoC enforcement

2019-06-06 17:42:07 +02:00

config.ru

…

CONTRIBUTING.md

Remove/update old "tootsuite" references, except those needed for Docker (#1860 )

2022-11-01 09:38:05 +01:00

crowdin.yml

Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085 )

2021-12-01 19:03:35 +01:00

docker-compose.yml

Update docker-compose.yml (#19063 )

2022-08-27 17:40:46 +02:00

Dockerfile

Install python3 when building with Docker (#18072 )

2022-09-29 16:36:14 +02:00

FEDERATION.md

Add FEDERATION.md (#17029 )

2021-11-23 00:15:31 +01:00

Gemfile

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

2022-10-28 19:23:58 +02:00

Gemfile.lock

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

2022-10-28 19:23:58 +02:00

ide-helper.js

Add JS IDE helper (#13012 )

2020-04-27 17:19:53 +02:00

jest.config.js

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

2022-05-04 19:15:50 +02:00

jsconfig.json

Replace CancelToken to AbortSignal (#19352 )

2022-10-14 03:16:37 +02:00

LICENSE

…

package.json

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

2022-11-06 09:50:41 +01:00

postcss.config.js

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

priv-config

TOR federation (#7875 )

2018-06-26 20:34:12 +02:00

Procfile

fix: make Procfile compatible with herokuish (#12685 )

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

Procfile.dev

Set RAILS_ENV in Procfile.dev (#15502 )

2021-01-07 09:30:12 +01:00

Rakefile

…

README.md

Drop support for Ruby v2.5 and Node.js v12 (#18323 )

2022-06-16 22:09:58 +02:00

scalingo.json

Format JSON and YAML using Prettier (#17823 )

2022-03-21 04:46:11 +01:00

SECURITY.md

Remove broken link references to bug bounty program (#19779 )

2022-11-05 17:27:44 +01:00

stylelint.config.js

Replace from Code Climate to Super-Linter (#18587 )

2022-06-01 19:22:35 +02:00

Vagrantfile

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

2022-02-17 10:58:44 +01:00

yarn.lock

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

2022-11-06 09:50:41 +01: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 47.6%

JavaScript 23.7%

TypeScript 14.7%

SCSS 8.8%

Haml 3.2%

Other 2%