T

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

Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.

2018-09-11 16:51:26 +02:00

.circleci

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

2018-08-18 18:04:49 +02:00

.github

Adapt github issue template to glitch-soc

2018-08-19 16:56:42 +02:00

app

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

2018-09-11 16:51:26 +02:00

bin

config/boot is required first (#8619 )

2018-09-07 05:42:54 +02:00

config

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

2018-09-11 16:51:26 +02:00

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

2018-08-22 20:56:32 +02:00

docs

…

lib

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

2018-09-11 16:51:26 +02:00

log

…

nanobox

…

public

…

spec

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

2018-09-11 16:51:26 +02:00

streaming

Add health endpoint to streaming API (#8441 )

2018-08-26 11:54:25 +02:00

vendor/assets

…

.babelrc

…

.buildpacks

Add ffmpeg buildpack for scalingo (#8500 )

2018-08-29 01:21:23 +02:00

.codeclimate.yml

…

.dockerignore

…

.editorconfig

…

.env.nanobox

Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423 )

2018-08-25 13:27:08 +02:00

.env.production.sample

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

2018-08-26 14:23:24 +02:00

.env.test

…

.env.vagrant

…

.eslintignore

…

.eslintrc.yml

…

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

Upgrade Node.js to v8.x on nvmrc (#8023 )

2018-07-15 12:29:17 +09:00

.postcssrc.yml

…

.profile

…

.rspec

…

.rubocop.yml

Fix low-hanging rubocop gripes (#8458 )

2018-08-26 19:22:46 +02:00

.ruby-version

…

.scss-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

…

Aptfile

Adjust Aptfile for Heroku-18 stack (#8588 )

2018-09-09 02:10:58 +02:00

AUTHORS.md

using mailto scheme in AUTHORS.md (#8663 )

2018-09-10 02:01:03 +02:00

boxfile.yml

…

Capfile

…

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

…

docker-compose.yml

Update docker config and move some workers to different queues (#8345 )

2018-09-02 16:13:06 +02:00

Dockerfile

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

2018-07-16 14:50:42 +02:00

Gemfile

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

2018-08-27 18:09:28 +02:00

Gemfile.lock

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

2018-08-27 18:09:28 +02:00

jest.config.js

…

LICENSE

…

package.json

Add notification badge to favicon

2018-09-07 20:37:17 +02:00

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

Fix CI badge, as we have switched from Travis to CircleCI

2018-09-03 17:41:28 +02:00

scalingo.json

Add ffmpeg buildpack for scalingo (#8500 )

2018-08-29 01:21:23 +02:00

stack-fix.c

…

Vagrantfile

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

2018-08-01 22:20:25 +02:00

yarn.lock

Add notification badge to favicon

2018-09-07 20:37:17 +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.

Languages

Ruby 57.6%

JavaScript 26.6%

SCSS 10%

Haml 5.5%

HTML 0.2%