0 Fork 0

T

David Yip 0aba716fe1 Merge pull request #471 from impiaaa/thread-icon

Add an extra icon to indicate that a status is part of a conversation

2018-06-01 00:35:13 -05:00

.circleci

Add CONTINUOUS_INTEGRATION: true to .circleci/config.yml (#7447 )

2018-05-11 11:51:07 +02:00

.github

Multiple Issue templates (#7402 )

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

app

Adjust spacing between status icons

2018-05-31 21:55:44 -07:00

bin

Port travis_retry for CI (#7379 )

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

config

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

2018-05-29 13:52:26 +02:00

Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00

docs

…

lib

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

2018-05-23 16:05:19 +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/merge-upstream

2018-05-29 13:52:26 +02:00

streaming

Add media timeline (#6631 )

2018-05-21 12:43:38 +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/merge-upstream

2018-05-29 13:52:26 +02:00

.env.test

Add parallel test processors (#7215 )

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

.env.vagrant

…

.eslintignore

…

.eslintrc.yml

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

2018-05-29 13:52:26 +02: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

ci: Hack around a Travis condition, I guess

2018-05-18 09:51:00 -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

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

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

docker-compose.yml

Remove Puma pidfile before boot if container receives SIGTERM (#7052 )

2018-05-25 18:50:31 +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/merge-upstream

2018-05-19 22:41:10 +02:00

Gemfile.lock

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

2018-05-19 22:41:10 +02:00

jest.config.js

…

LICENSE

…

package.json

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

2018-05-29 13:52:26 +02:00

Procfile

…

Procfile.dev

Fix Procfile on OS X (#6748 )

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

Rakefile

…

README.md

Merge upstream (#111 )

2017-08-01 13:20:29 -07: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 branch 'master' into glitch-soc/merge-upstream

2018-05-29 13:52:26 +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.