Go to file

Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`

2023-01-05 14:16:25 +01:00

.circleci

Update circleci (#21880 )

2022-12-15 18:13:13 +01:00

.devcontainer

Install SSH server into devcontainer image (#22679 )

2023-01-05 13:32:59 +01:00

.github

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

2023-01-05 14:16:25 +01:00

app

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

2023-01-05 14:16:25 +01:00

bin

Update Mastodon to Rails 6.1 (#15910 )

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

chart

helm: cleanup helm chart, now in mastodon/chart (#21801 )

2022-12-09 06:36:29 +01:00

config

Fix root key for glitch-soc pt-PT and pt-BR yaml translations (#2065 )

2023-01-04 18:47:01 +01:00

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

2022-12-07 09:03:42 +01:00

dist

Fix nginx location matching (#20198 )

2022-11-09 04:12:57 +01:00

lib

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

2023-01-05 14:16:25 +01:00

log

Initial commit

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

public

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

2023-01-05 14:16:25 +01:00

spec

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

2023-01-05 14:16:25 +01:00

streaming

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

2022-12-21 15:59:39 +01:00

vendor

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

Add final newline to locale files (#2890 )

2017-05-07 19:55:47 +02:00

.env.production.sample

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

2022-12-15 20:25:25 +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

Enable eslint:recommended ruleset (#22433 )

2022-12-19 00:51:37 +09:00

.foreman

Replace sprockets/browserify with Webpack (#2617 )

2017-05-03 02:04:16 +02:00

.gitattributes

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

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

.gitignore

helm: cleanup helm chart, now in mastodon/chart (#21801 )

2022-12-09 06:36:29 +01:00

.gitmodules

Rename themes -> flavours ? ?

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

.haml-lint.yml

Added haml-lint and fix warnings (#2773 )

2017-05-08 03:35:25 +02:00

.nanoignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.nvmrc

Align everything to Node.js 16 (#22223 )

2022-12-15 17:43:26 +01:00

.prettierignore

Fix prettifier/lint issues (#2066 )

2023-01-04 18:38:45 +01:00

.prettierrc.js

Format JSON and YAML using Prettier (#17823 )

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

.profile

Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276 )

2017-05-24 17:57:33 +02:00

.rspec

Adding a Mention model, test stubs

2016-02-25 00:17:01 +01:00

.rubocop.yml

Run Prettier on YML files (#22345 )

2022-12-16 11:11:52 +09: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

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.yarnclean

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

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

app.json

Make enable_starttls configurable by envvars (#20321 )

2022-11-10 21:06:21 +01:00

Aptfile

Remove packages that are provided by Heroku stacks (#19836 )

2022-12-15 18:55:29 +01:00

AUTHORS.md

Update AUTHORS.md (#20630 )

2022-11-14 08:33:24 +01:00

babel.config.js

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

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

Capfile

remove capistrano/faster_assets from Capfile (#2737 )

2017-05-03 12:14:52 +02:00

CHANGELOG.md

Bump version to 4.0.2 (#20725 )

2022-11-15 03:57:18 +01:00

CODE_OF_CONDUCT.md

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

2022-12-21 15:59:39 +01:00

config.ru

Fix rubocop issues, introduce usage of frozen literal to improve performance

2016-11-15 16:56:29 +01:00

CONTRIBUTING.md

Add links to glitch-soc's Crowdin (#2033 )

2022-12-21 23:49:08 +01:00

crowdin-glitch.yml

Add crowdin configuration file (#2030 )

2022-12-21 22:13:22 +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

Add hadolint as Dockerfile linter (#20993 )

2022-12-15 15:57:17 +01:00

FEDERATION.md

Add FEDERATION.md (#17029 )

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

Gemfile

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

2023-01-05 14:16:25 +01:00

Gemfile.lock

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

2023-01-05 14:16:25 +01: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

Correct prettier calls for YML/JSON (#21832 )

2022-12-03 12:05:35 +09:00

LICENSE

Fix #49 - License changed from GPL-2.0 to AGPL-3.0

2016-09-21 23:04:34 +02:00

package.json

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

2023-01-05 14:16:25 +01:00

postcss.config.js

Remove object-fit polyfill for the old Microsoft Edge (#22693 )

2023-01-05 13:32:02 +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

Initial commit

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

README.md

Downgrade Node.js requirement to 14+ (#22342 )

2023-01-05 13:47:36 +01:00

scalingo.json

Make enable_starttls configurable by envvars (#20321 )

2022-11-10 21:06:21 +01:00

SECURITY.md

Change e-mail in SECURITY.md (#20384 )

2022-11-11 05:26:43 +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-12-07 09:03:42 +01:00

yarn.lock

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

2023-01-05 14:16:25 +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 49%

TypeScript 22.6%

JavaScript 17.7%

SCSS 7.2%

Haml 3.2%

Other 0.3%