Alex Mastodon Fork
 
 
 
 
 
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 () 2022-03-28 12:43:58 +02:00
.devcontainer Format JSON and YAML using Prettier () 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 () 2021-03-24 10:44:31 +01:00
chart chore(deps): update tootsuite/mastodon docker tag to v3.5.1 () 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 () 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 Resync Nanobox files with the 2.9.0 release () 2019-06-14 14:52:31 +02:00
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 () 2019-01-04 11:28:38 +01:00
.buildpacks Remove nodejs buildpack from buildpacks () 2020-07-20 09:48:10 +02:00
.codeclimate.yml Format JSON and YAML using Prettier () 2022-03-21 04:46:11 +01:00
.deepsource.toml Update .deepsource.toml () 2021-02-19 09:53:25 +01:00
.dockerignore Update .dockerignore/.gitignore for etc () 2021-12-06 18:04:04 +01:00
.editorconfig
.env.nanobox Remove support for OAUTH_REDIRECT_AT_SIGN_IN () 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 Bump webpacker from 4.0.7 to 4.2.0 () 2019-11-20 17:56:11 +01:00
.env.vagrant Add a default DB_HOST to .env.vagrant for enable the streaming () 2020-06-15 01:57:06 +02:00
.eslintignore Increase files checked by ESLint () 2019-01-04 11:28:38 +01:00
.eslintrc.js Replace deprecated String.prototype.substr() () 2022-04-04 12:19:45 -04:00
.foreman
.gitattributes
.gitignore Update .dockerignore/.gitignore for etc () 2021-12-06 18:04:04 +01:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc NodeJS 14 support - circleci/docker/.nvmrc () 2021-08-10 22:56:13 +02:00
.prettierignore Format JSON and YAML using Prettier () 2022-03-21 04:46:11 +01:00
.prettierrc.js Format JSON and YAML using Prettier () 2022-03-21 04:46:11 +01:00
.profile
.rspec
.rubocop.yml Format JSON and YAML using Prettier () 2022-03-21 04:46:11 +01:00
.ruby-version Upgrade Ruby to 3.0.3 () 2021-11-24 20:29:05 +01:00
.sass-lint.yml Fix sass-lint config () 2019-06-06 18:51:46 +02:00
.slugignore
.yarnclean Replace from scss-lint to sass-lint () 2019-06-04 17:23:18 +02:00
AUTHORS.md Bump version to 3.5.0rc1 () 2022-03-15 08:16:45 +01:00
Aptfile Remove protobuf dependencies () 2022-02-14 16:08:02 +01:00
CHANGELOG.md Bump version to 3.5.1 () 2022-04-08 21:57:24 +02:00
CODE_OF_CONDUCT.md Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02:00
CONTRIBUTING.md Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
Capfile
Dockerfile Bump NODE_VER to 16.14.2 () 2022-03-19 09:24:26 +01:00
FEDERATION.md Add FEDERATION.md () 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
LICENSE
Procfile fix: make Procfile compatible with herokuish () 2020-08-29 19:00:30 +02:00
Procfile.dev Set RAILS_ENV in Procfile.dev () 2021-01-07 09:30:12 +01:00
README.md Bump version to 3.5.0rc1 () 2022-03-15 08:16:45 +01:00
Rakefile
SECURITY.md Add v3.5.x to SECURITY.md () 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 () 2022-03-21 04:46:11 +01:00
babel.config.js Remove dependency for @babel/plugin-proposal-class-properties () 2021-05-04 23:13:04 +02:00
boxfile.yml Format JSON and YAML using Prettier () 2022-03-21 04:46:11 +01:00
config.ru
crowdin.yml Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. () 2021-12-01 19:03:35 +01:00
docker-compose.yml Format JSON and YAML using Prettier () 2022-03-21 04:46:11 +01:00
ide-helper.js Add JS IDE helper () 2020-04-27 17:19:53 +02:00
package.json Merge branch 'main' into glitch-soc/merge-upstream 2022-04-27 08:48:21 +02:00
postcss.config.js Increase files checked by ESLint () 2019-01-04 11:28:38 +01:00
priv-config
scalingo.json Format JSON and YAML using Prettier () 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?