T

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

Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml

2018-08-31 19:10:57 +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-08-31 19:10:57 +02:00

bin

Add improved CLI interface for removing remote media (#8411 )

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

config

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

2018-08-31 19:10:57 +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-08-31 19:10:57 +02:00

log

…

nanobox

…

public

…

spec

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

2018-08-31 19:10:57 +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

Dev Tooling fixes (eslint/editorconfig) (#1398 )

2017-04-11 00:36:03 +02:00

.eslintrc.yml

…

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

…

.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

…

AUTHORS.md

docs: Add AUTHORS file (#6685 )

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

boxfile.yml

…

Capfile

…

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

…

docker-compose.yml

Update docker-compose to cope with build-time assets (#8156 )

2018-08-09 22:37:48 +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

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

2018-08-01 00:18:13 +02:00

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

…

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

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

2018-08-01 00:18:13 +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%