T

David Yip eb39db7f93 Merge remote-tracking branch 'origin/master' into gs-master

Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml

2018-04-01 20:24:50 -05:00

.github

…

app

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

2018-04-01 20:24:50 -05:00

bin

…

config

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

2018-04-01 20:24:50 -05:00

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-25 15:17:21 +00:00

docs

…

lib

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

2018-03-27 10:44:12 -05:00

log

…

nanobox

…

public

Fix error 500 page

2018-03-16 22:31:20 +01:00

spec

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

2018-04-01 20:24:50 -05:00

streaming

…

vendor/assets

…

.babelrc

Remove debug option from Babel preset env (#6852 )

2018-03-21 10:26:15 +01:00

.buildpacks

…

.codeclimate.yml

…

.dockerignore

…

.editorconfig

…

.env.nanobox

[Nanobox] Enable ElasticSearch support by default (#6977 )

2018-03-31 13:17:25 +02:00

.env.production.sample

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-30 19:17:17 +00:00

.env.test

…

.env.vagrant

…

.eslintignore

…

.eslintrc.yml

…

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

…

.postcssrc.yml

…

.profile

…

.rspec

…

.rubocop.yml

…

.ruby-version

Update Ruby to version 2.4.4 (#6964 )

2018-04-01 23:43:08 +02:00

.scss-lint.yml

…

.slugignore

…

.travis.yml

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

2018-04-01 20:24:50 -05:00

.yarnclean

…

app.json

…

Aptfile

…

AUTHORS.md

docs: Add AUTHORS file (#6685 )

2018-03-09 13:11:43 +01:00

boxfile.yml

[Nanobox] Enable ElasticSearch support by default (#6977 )

2018-03-31 13:17:25 +02:00

Capfile

…

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

…

docker-compose.yml

…

Dockerfile

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

2018-04-01 20:24:50 -05:00

Gemfile

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-30 19:17:17 +00:00

Gemfile.lock

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-30 19:17:17 +00:00

jest.config.js

…

LICENSE

…

package.json

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-30 19:17:17 +00:00

Procfile

…

Procfile.dev

Fix Procfile on OS X (#6748 )

2018-03-12 03:50:40 +01:00

Rakefile

…

README.md

Add license info to README (#6583 )

2018-03-11 15:12:23 +01:00

scalingo.json

Missing OTP_SECRET in scalingo.json (#6917 )

2018-03-26 12:47:34 +02:00

stack-fix.c

…

Vagrantfile

…

yarn.lock

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-30 19:17:17 +00: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%