Go to file

Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

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

.circleci

Disable simplecov on CircleCI (#7416 )

2018-05-09 16:59:58 +02:00

.github

Multiple Issue templates (#7402 )

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

app

Merge branch 'master' into glitch-soc/master

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

bin

Port travis_retry for CI (#7379 )

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

config

Merge branch 'master' into glitch-soc/master

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

Merge branch 'master' into glitch-soc/master

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

docs

…

lib

Merge branch 'master' into glitch-soc/master

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

log

…

nanobox

[Nanobox] Tuning Update (#6660 )

2018-03-06 21:59:35 +01:00

public

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

2018-04-11 00:50:09 +00:00

spec

Merge branch 'master' into glitch-soc/master

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

streaming

Direct messages column (#4514 )

2018-04-18 13:09:06 +02:00

vendor/assets

…

.babelrc

Remove debug option from Babel preset env (#6852 )

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

.buildpacks

…

.codeclimate.yml

…

.dockerignore

Ignore elasticsearch directory (#7070 )

2018-04-08 16:57:16 +09:00

.editorconfig

…

.env.nanobox

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

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

.env.production.sample

Merge branch 'master' into glitch-soc/master

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

.env.test

Add parallel test processors (#7215 )

2018-04-21 21:36:22 +02:00

.env.vagrant

…

.eslintignore

…

.eslintrc.yml

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

2018-04-03 19:17:20 +00:00

.foreman

…

.gitattributes

…

.gitignore

Ignore elasticsearch directory (#7070 )

2018-04-08 16:57:16 +09:00

.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

Replace Travis to CircleCI (#7196 )

2018-04-20 13:46:08 +02: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

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

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

docker-compose.yml

docker-compose: Only bind ports 3000 and 4000 on localhost. (#7138 )

2018-04-15 13:57:58 +02:00

Dockerfile

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

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

Gemfile

Merge branch 'master' into glitch-soc/master

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

Gemfile.lock

Merge branch 'master' into glitch-soc/master

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

Fix Procfile on OS X (#6748 )

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

Rakefile

…

README.md

Replace badge to CircleCI (#7216 )

2018-04-21 21:56:40 +02:00

scalingo.json

Missing OTP_SECRET in scalingo.json (#6917 )

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

stack-fix.c

…

Vagrantfile

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

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.

Languages

Ruby 57.6%

JavaScript 26.6%

SCSS 10%

Haml 5.5%

HTML 0.2%