A fork of glitch-soc.
 
 
 
 
 
 
Go to file
Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.js`:
  Conflicts due to glitch-soc's theming system.
  Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
  Minor conflict due to glitch-soc's option to allow CWed toots in trends.
  Ported upstream changes.
2022-05-01 16:52:27 +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-05-01 16:52:27 +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-05-01 16:52:27 +02:00
db Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +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-05-01 16:52:27 +02:00
log
nanobox
public Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2022-04-25 17:09:32 +02:00
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.buildpacks
.codeclimate.yml Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
.deepsource.toml
.dockerignore
.editorconfig
.env.nanobox
.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
.gitmodules
.haml-lint.yml
.nanoignore Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.nvmrc
.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
.sass-lint.yml
.slugignore
.yarnclean Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
AUTHORS.md Bump version to 3.5.0rc1 (#17618) 2022-03-15 08:16:45 +01:00
Aptfile
CHANGELOG.md Bump version to 3.5.1 (#18000) 2022-04-08 21:57:24 +02:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Capfile
Dockerfile Bump NODE_VER to 16.14.2 (#17825) 2022-03-19 09:24:26 +01:00
FEDERATION.md
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
LICENSE
Procfile
Procfile.dev
README.md Bump version to 3.5.0rc1 (#17618) 2022-03-15 08:16:45 +01:00
Rakefile
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
app.json Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
babel.config.js
boxfile.yml Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
config.ru
crowdin.yml
docker-compose.yml Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
ide-helper.js
package.json Merge branch 'main' into glitch-soc/merge-upstream 2022-04-27 08:48:21 +02:00
postcss.config.js
priv-config
scalingo.json Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +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!

Build Status Code Climate

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?