mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 11:11:11 +02:00

Go to file

Claire a4e7cc2d94 Merge pull request #2590 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to bf153b384b

2024-01-28 14:47:35 +01:00

.devcontainer

chore(deps): update devdependencies (non-major) (#28840 )

2024-01-23 11:44:50 +00:00

.github

Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream

2024-01-26 20:47:20 +01:00

.husky

Use Yarn instead of NPX for pre-commit hook (#24287 )

2023-03-28 06:28:57 +02:00

.yarn

Replace our custom compression-webpack-plugin patch with the fixed upstream version (#28510 )

2023-12-29 09:33:06 +00:00

app

Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream

2024-01-27 19:06:41 +01:00

bin

Use bundler version 2.5.4 (#28765 )

2024-01-17 14:35:55 +00:00

chart

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

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

config

Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream

2024-01-26 20:47:20 +01:00

Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream

2024-01-25 19:51:19 +01:00

dist

Add suggestion for secure cyphers to nginx.conf (#26349 )

2023-08-31 12:17:10 +02:00

lib

Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream

2024-01-27 19:06:41 +01:00

log

Initial commit

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

public

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

2024-01-15 20:01:36 +01:00

spec

Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream

2024-01-27 19:06:41 +01:00

streaming

Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream

2024-01-24 20:42:53 +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

.bundler-audit.yml

Ignore the devise-two-factor advisory as we have rate limits in place (#28733 )

2024-01-15 10:45:48 +00:00

.dockerignore

Do not copy public/packs-test into Docker (#27736 )

2023-11-07 09:22:04 +00:00

.editorconfig

Enable EditorConfig trailing whitespace trimming (#23543 )

2023-02-12 08:34:17 +01:00

.env.production.sample

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

2022-12-15 20:25:25 +01:00

.env.test

Improve Babel configuration and automatically load polyfills (#27333 )

2023-10-31 10:55:13 +00:00

.env.vagrant

Add elastic search installation into Vagrantfile (#26512 )

2023-08-23 15:46:14 +02:00

.eslintignore

Increase files checked by ESLint (#9705 )

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

.eslintrc.js

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

2024-01-10 18:26:47 +01: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

Upgrade to Yarn 4, remove support for Node 16 (#27073 )

2023-11-08 10:57:21 +00:00

.gitmodules

Rename themes -> flavours ? ?

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

.haml-lint_todo.yml

Fix LineLength haml-lint in media/player view (#28667 )

2024-01-10 09:35:01 +00:00

.haml-lint.yml

Update haml-lint line length configuration to match rubocop value (#27570 )

2023-10-31 09:47:16 +00:00

.nanoignore

Remove Storybook (#4397 )

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

.nvmrc

Update dependency node to 20.11 (#28670 )

2024-01-11 12:48:01 +00:00

.prettierignore

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

2024-01-13 12:11:29 +01:00

.prettierrc.js

Use Prettier for ESLint formatting TypeScript (#23631 )

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

.profile

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

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

.rspec

Adding a Mention model, test stubs

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

.rubocop_todo.yml

Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream

2024-01-27 19:06:41 +01:00

.rubocop.yml

Fix Rails/RakeEnvironment cop (#28782 )

2024-01-17 16:33:17 +00:00

.ruby-gemset

Make Mastodon use its own gemset (#17858 )

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

.ruby-version

Use ruby version 3.2.3 (#28817 )

2024-01-22 11:55:51 +00:00

.simplecov

Disable simplecov enable_coverage_for_eval option, move to standalone file (#27869 )

2023-11-15 23:09:31 +00:00

.slugignore

Remove Storybook (#4397 )

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

.watchmanconfig

Fix Jest config (#27834 )

2023-11-13 12:19:41 +00:00

.yarnrc.yml

Upgrade to Yarn 4, remove support for Node 16 (#27073 )

2023-11-08 10:57:21 +00:00

app.json

Make enable_starttls configurable by envvars (#20321 )

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

Aptfile

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

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

AUTHORS.md

Update AUTHORS.md (#27018 )

2023-09-21 14:42:15 +02:00

babel.config.js

Disable Babel polyfill injection in dev (#27691 )

2023-11-06 10:24:41 +00:00

CHANGELOG.md

Prune the changelog of older entries (#27432 )

2023-10-23 14:35:56 +02:00

CODE_OF_CONDUCT.md

Update Contributor Covenant to 2.1 (#23980 )

2023-04-23 23:11:50 +02:00

config.ru

Autofix Rubocop remaining Layout rules (#23679 )

2023-02-20 06:58:28 +01:00

CONTRIBUTING.md

Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream

2023-12-21 18:17:17 +01:00

crowdin-glitch.yml

Fix Crowdin Github Action (#2311 )

2023-07-19 08:36:25 +02:00

crowdin.yml

Add a Github Action to send translations to Crowdin for each merge in main (#25869 )

2023-07-18 16:56:01 +02:00

docker-compose.yml

Change startup command for Puma in Docker Compose (#28138 )

2023-12-01 11:06:37 +00:00

Dockerfile

Use ruby version 3.2.3 (#28817 )

2024-01-22 11:55:51 +00:00

FEDERATION.md

docs: update FEDERATION.md to more closely follow FEP conventions. (#28838 )

2024-01-22 11:11:47 +00:00

Gemfile

Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream

2024-01-27 19:06:41 +01:00

Gemfile.lock

Update paperclip and climate_control gems (#28379 )

2024-01-25 15:18:15 +00:00

ide-helper.js

Add JS IDE helper (#13012 )

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

jest.config.js

Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream

2024-01-15 20:06:31 +01:00

jsconfig.json

chore(deps): update devdependencies (non-major) (#28840 )

2024-01-23 11:44:50 +00:00

LICENSE

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

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

lint-staged.config.js

Improve lint-staged config (#28704 )

2024-01-12 09:09:57 +00:00

package.json

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

2024-01-15 20:27:41 +01:00

postcss.config.js

Update PostCSS dependencies (#23835 )

2023-03-15 04:01:10 +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

Split streaming server from web server (#24702 )

2023-11-14 17:43:20 +00:00

Rakefile

Run Rubocop on Rakefile (#23871 )

2023-07-12 09:47:54 +02:00

README.md

2024-01-01 19:08:01 +00:00

scalingo.json

Add S3 region list reference to Scalingo config (#24152 )

2023-04-26 16:46:19 +02:00

SECURITY.md

Remove v3.5 branch from supported Mastodon versions (#28574 )

2024-01-03 15:04:10 +00:00

stylelint.config.js

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

2023-04-29 10:44:56 +02:00

tsconfig.json

Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream

2024-01-24 20:42:53 +01:00

Vagrantfile

Change Vagrant to install Node 20 (#28100 )

2023-11-30 10:46:06 +00:00

yarn.lock

Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream

2024-01-26 20:47:20 +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 48.9%

TypeScript 24%

JavaScript 17.1%

SCSS 6.5%

Haml 3.2%

Other 0.3%