T

Claire 80f89f9cf2 Merge commit '9974163776b3e65e7cfa41e6293876909a1635b7' into glitch-soc/merge-upstream

Conflicts:
- `app/views/layouts/admin.html.haml`:
  Upstream moved `javascript_pack_tag` calls around, but we don't use them in
  the same way in glitch-soc due to the different theming system.
  Kept glitch-soc's files unchanged.

2023-08-24 21:52:19 +02:00

.devcontainer

Do not start LibreTranslate and Elasticsearch on GitHub Codespaces (#26382 )

2023-08-21 08:51:37 +02:00

.github

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

2023-08-21 21:07:39 +02:00

.husky

…

app

[Glitch] Change opacity of the delete icon in the search field to be more visible

2023-08-24 21:51:13 +02:00

bin

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

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

chart

…

config

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

2023-08-24 21:26:27 +02:00

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

2023-08-24 20:55:28 +02:00

dist

Make mastodon-streaming systemd unit templated (#24751 )

2023-08-07 15:41:34 +02:00

lib

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

2023-08-24 21:46:17 +02:00

log

…

public

Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

2023-08-13 18:47:15 +02:00

spec

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

2023-08-24 21:50:14 +02:00

streaming

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

2023-08-24 20:55:28 +02:00

vendor

…

.browserslistrc

…

.buildpacks

…

.dockerignore

…

.editorconfig

…

.env.production.sample

…

.env.test

…

.env.vagrant

Add elastic search installation into Vagrantfile (#26512 )

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

.eslintignore

…

.eslintrc.js

Add eslint rule to forbid vanilla imports in glitch (#2293 )

2023-07-13 21:36:23 +02:00

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint_todo.yml

Fix haml-lint Rubocop Lint/UnusedBlockArguments cop (#26039 )

2023-07-20 17:03:39 +02:00

.haml-lint.yml

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

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

.nanoignore

…

.nvmrc

Update Node.js to 16.20.0 (#24316 )

2023-04-07 14:26:11 +02:00

.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

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

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

.rspec

…

.rubocop_todo.yml

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

2023-08-24 21:26:27 +02:00

.rubocop.yml

Update rubocop rules for linelength (#26190 )

2023-07-28 23:11:45 +02:00

.ruby-gemset

…

.ruby-version

…

.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

Bump version to v4.2.0-beta2 (#26579 )

2023-08-21 20:18:49 +02:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

Fix glitch-soc Markdown linting issues (#2168 )

2023-04-08 17:23:24 +02: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

Bump version to v4.1.6 (#26272 )

2023-07-31 21:11:25 +02:00

Dockerfile

Fix minor typos in comments and spec names (#21831 )

2023-05-19 17:13:29 +02:00

FEDERATION.md

…

Gemfile

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

2023-08-24 21:50:14 +02:00

Gemfile.lock

Update dependency rspec-sidekiq to v4 (#26627 )

2023-08-24 09:03:40 +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 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream

2023-08-24 21:26:27 +02:00

postcss.config.js

…

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

Run Rubocop on Rakefile (#23871 )

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

README.md

Update README.md (#25435 )

2023-07-28 23:09:19 +02:00

scalingo.json

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

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

SECURITY.md

Update SECURITY.md to indicate issues can be reported on Github (#26599 )

2023-08-22 16:47:19 +02:00

stylelint.config.js

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

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

tsconfig.json

Fix interaction modal being broken because of glitch-soc's theming system

2023-07-30 16:45:50 +02:00

Vagrantfile

Add elastic search installation into Vagrantfile (#26512 )

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

yarn.lock

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

2023-08-24 21:46:17 +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 46.6%

JavaScript 36.5%

SCSS 10.9%

Haml 3.7%

TypeScript 2%

Other 0.2%