Treehouse Mastodon git tree

Go to file

ThibG 64fedb341a Merge pull request #802 from ThibG/glitch-soc/merge-upstream Merge upstream changes		2018-10-30 20:10:09 +01:00
.circleci	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-28 08:37:49 +01:00
.github	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
app	[Glitch] Fix empty display name precedence over username in web UI	2018-10-30 17:54:50 +01:00
bin	…
config	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 17:52:08 +01:00
db	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-28 08:37:49 +01:00
dist	…
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 17:52:08 +01:00
log	…
nanobox	…
public	…
spec	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 17:52:08 +01:00
streaming	Fix crash when using UNIX socket (#9036 )	2018-10-21 16:41:33 +02:00
vendor/assets	…
.buildpacks	…
.codeclimate.yml	…
.dockerignore	…
.editorconfig	…
.env.nanobox	…
.env.production.sample	…
.env.test	Do not test PAM authentication by default (#9027 )	2018-10-20 07:32:26 +02:00
.env.vagrant	…
.eslintignore	…
.eslintrc.yml	…
.foreman	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.haml-lint.yml	…
.nanoignore	…
.nvmrc	…
.postcssrc.yml	…
.profile	…
.rspec	…
.rubocop.yml	…
.ruby-version	Use Ruby ==2.5.2== 2.5.3 (#9003 )	2018-10-18 22:32:47 +02:00
.scss-lint.yml	…
.slugignore	…
.yarnclean	…
AUTHORS.md	Update AUTHORS.md (#9141 )	2018-10-29 14:05:53 +01:00
Aptfile	…
CHANGELOG.md	Bump version to 2.6.0rc4 (#9164 )	2018-10-30 17:37:49 +01:00
CODE_OF_CONDUCT.md	…
CONTRIBUTING.md	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
Capfile	…
Dockerfile	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-23 17:15:57 +02:00
Gemfile	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 11:22:25 +01:00
Gemfile.lock	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 17:52:08 +01:00
LICENSE	…
Procfile	…
Procfile.dev	…
README.md	Improve README (#9012 )	2018-10-19 18:49:35 +02:00
Rakefile	…
Vagrantfile	…
app.json	…
babel.config.js	…
boxfile.yml	…
config.ru	…
docker-compose.yml	Persist volumes by default in docker-compose (#9055 )	2018-10-23 00:08:25 +02:00
jest.config.js	…
package.json	…
priv-config	…
scalingo.json	…
stack-fix.c	…
yarn.lock	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-07 19:47:56 +02: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.