Go to file

Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		2018-12-09 16:08:04 +01:00
.circleci	…
.github	…
app	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
bin	…
config	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
db	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
dist	…
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-06 12:44:38 +01:00
log	…
nanobox	Update Nginx config for Nanobox apps (#9310 )	2018-11-20 22:24:35 +01:00
public	…
spec	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
streaming	Only stream local-only toots to logged-in users	2018-11-13 18:55:57 +01:00
vendor/assets	…
.buildpacks	…
.codeclimate.yml	…
.dockerignore	…
.editorconfig	…
.env.nanobox	…
.env.production.sample	…
.env.test	…
.env.vagrant	…
.eslintignore	…
.eslintrc.yml	…
.foreman	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.haml-lint.yml	…
.nanoignore	…
.nvmrc	…
.postcssrc.yml	…
.profile	…
.rspec	…
.rubocop.yml	…
.ruby-version	…
.scss-lint.yml	…
.slugignore	…
.yarnclean	…
AUTHORS.md	…
Aptfile	…
CHANGELOG.md	Bump version to 2.6.5 (#9413 )	2018-12-02 17:41:38 +01:00
CODE_OF_CONDUCT.md	…
CONTRIBUTING.md	…
Capfile	…
Dockerfile	…
Gemfile	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-06 12:44:38 +01:00
Gemfile.lock	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
LICENSE	…
Procfile	…
Procfile.dev	…
README.md	…
Rakefile	…
Vagrantfile	…
app.json	…
babel.config.js	…
boxfile.yml	…
config.ru	…
docker-compose.yml	…
jest.config.js	…
package.json	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-30 20:16:26 +01:00
priv-config	…
scalingo.json	…
stack-fix.c	…
yarn.lock	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-30 20:16:26 +01:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

So here's the deal: we all work on this code, and then it runs on dev.glitch.social 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.