T

Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes

2018-05-27 13:20:15 +02:00

.circleci

Add CONTINUOUS_INTEGRATION: true to .circleci/config.yml (#7447 )

2018-05-11 11:51:07 +02:00

.github

Multiple Issue templates (#7402 )

2018-05-08 13:35:33 +02:00

app

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

2018-05-27 13:20:15 +02:00

bin

Port travis_retry for CI (#7379 )

2018-05-06 10:55:50 +02:00

config

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

2018-05-27 13:20:15 +02:00

Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00

docs

…

lib

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

2018-05-23 16:05:19 +02:00

log

…

nanobox

…

public

…

spec

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

2018-05-23 16:05:19 +02:00

streaming

Add media timeline (#6631 )

2018-05-21 12:43:38 +02:00

vendor/assets

…

.babelrc

…

.buildpacks

…

.codeclimate.yml

…

.dockerignore

…

.editorconfig

…

.env.nanobox

…

.env.production.sample

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

.env.test

…

.env.vagrant

…

.eslintignore

…

.eslintrc.yml

…

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

…

.postcssrc.yml

Add object-fit polyfill for Edge (#4182 )

2017-07-14 01:59:34 +02:00

.profile

…

.rspec

…

.rubocop.yml

…

.ruby-version

…

.scss-lint.yml

…

.slugignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.travis.yml

ci: Hack around a Travis condition, I guess

2018-05-18 09:51:00 -05:00

.yarnclean

…

app.json

…

Aptfile

…

AUTHORS.md

…

boxfile.yml

…

Capfile

…

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-04 12:16:12 -05:00

docker-compose.yml

Remove Puma pidfile before boot if container receives SIGTERM (#7052 )

2018-05-25 18:50:31 +02:00

Dockerfile

…

Gemfile

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

2018-05-19 22:41:10 +02:00

Gemfile.lock

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

2018-05-19 22:41:10 +02:00

jest.config.js

…

LICENSE

…

package.json

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

…

scalingo.json

…

stack-fix.c

…

Vagrantfile

…

yarn.lock

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +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.