T

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

Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js

2018-10-09 21:08:26 +02:00

.circleci

…

.github

…

app

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

2018-10-09 21:08:26 +02:00

bin

Upgrade Babel to version 7.0.0 (#5925 )

2018-09-14 17:59:48 +02:00

config

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

2018-10-09 21:08:26 +02:00

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

2018-10-09 21:08:26 +02:00

dist

Add nginx and systemd templates (#8770 )

2018-09-24 16:46:05 +02:00

lib

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

2018-10-08 13:51:33 +02:00

log

…

nanobox

…

public

…

spec

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

2018-10-08 13:51:33 +02:00

streaming

Add conversations API (#8832 )

2018-10-07 23:44:58 +02:00

vendor/assets

…

.buildpacks

…

.codeclimate.yml

…

.dockerignore

…

.editorconfig

…

.env.nanobox

…

.env.production.sample

…

.env.test

…

.env.vagrant

update vagrant configs (#8706 )

2018-09-16 14:49:15 -04:00

.eslintignore

…

.eslintrc.yml

…

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

…

.postcssrc.yml

…

.profile

…

.rspec

…

.rubocop.yml

Move more tasks to tootctl (#8675 )

2018-09-14 17:42:22 +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

babel.config.js

Upgrade Babel to version 7.0.0 (#5925 )

2018-09-14 17:59:48 +02:00

boxfile.yml

…

Capfile

…

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

…

docker-compose.yml

Misc. typos (#8694 )

2018-09-14 00:53:09 +02:00

Dockerfile

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

2018-10-05 15:23:57 +02:00

Gemfile

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

2018-10-09 21:08:26 +02:00

Gemfile.lock

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

2018-10-09 21:08:26 +02:00

jest.config.js

…

LICENSE

…

package.json

Revert Font Awesome 5 upgrade (#8810 )

2018-09-28 02:11:14 +02:00

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

Fix build status link in README.md

2018-09-28 21:18:04 +02:00

scalingo.json

…

stack-fix.c

…

Vagrantfile

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

2018-09-19 21:46:01 +02:00

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.

Languages

Ruby 57.6%

JavaScript 26.6%

SCSS 10%

Haml 5.5%

HTML 0.2%