Go to file

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

Conflicts:
- `package.json`:
  Not a real conflict, upstream dependency updated textually too close to a
  glitch-soc-only dependency.
  Updated the upstream dependency.

2022-04-27 08:48:21 +02:00

.circleci

Fix test-related issues (#17888 )

2022-03-28 12:43:58 +02:00

.devcontainer

Format JSON and YAML using Prettier (#17823 )

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

.github

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

2022-03-30 15:02:56 +02:00

app

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

2022-04-27 08:48:21 +02:00

bin

Update Mastodon to Rails 6.1 (#15910 )

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

chart

chore(deps): update tootsuite/mastodon docker tag to v3.5.1 (#18023 )

2022-04-12 03:26:50 +02:00

config

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

2022-04-25 17:09:32 +02:00

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

2022-04-27 08:48:21 +02:00

dist

Also compress SVG and ICO images in nginx (#17651 )

2022-02-26 17:27:11 +01:00

lib

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

2022-04-27 08:48:21 +02:00

log

…

nanobox

…

public

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

2022-02-01 20:59:28 +01:00

spec

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

2022-04-27 08:48:21 +02:00

streaming

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

2022-04-25 17:09:32 +02:00

vendor

…

.buildpacks

…

.codeclimate.yml

Format JSON and YAML using Prettier (#17823 )

2022-03-21 04:46:11 +01: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.nanobox

Remove support for OAUTH_REDIRECT_AT_SIGN_IN (#17287 )

2022-01-23 15:50:41 +01:00

.env.production.sample

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

2022-03-08 20:22:54 +01:00

.env.test

…

.env.vagrant

…

.eslintignore

…

.eslintrc.js

Replace deprecated String.prototype.substr() (#17949 )

2022-04-04 12:19:45 -04:00

.foreman

…

.gitattributes

…

.gitignore

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

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

.gitmodules

…

.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

Format JSON and YAML using Prettier (#17823 )

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

.ruby-version

Upgrade Ruby to 3.0.3 (#17038 )

2021-11-24 20:29:05 +01:00

.sass-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

Format JSON and YAML using Prettier (#17823 )

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

Aptfile

Remove protobuf dependencies (#17539 )

2022-02-14 16:08:02 +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

boxfile.yml

Format JSON and YAML using Prettier (#17823 )

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

Capfile

…

CHANGELOG.md

Bump version to 3.5.1 (#18000 )

2022-04-08 21:57:24 +02:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

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

2021-07-13 17:57:15 +02: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

Format JSON and YAML using Prettier (#17823 )

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

Dockerfile

Bump NODE_VER to 16.14.2 (#17825 )

2022-03-19 09:24:26 +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

2022-04-25 17:09:32 +02:00

Gemfile.lock

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

2022-04-27 08:48:21 +02:00

ide-helper.js

…

LICENSE

…

package.json

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

2022-04-27 08:48:21 +02:00

postcss.config.js

…

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

Bump version to 3.5.0rc1 (#17618 )

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

scalingo.json

Format JSON and YAML using Prettier (#17823 )

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

SECURITY.md

Add v3.5.x to SECURITY.md (#17998 )

2022-04-08 20:18:20 +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-04-27 08:48:21 +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%