T

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

Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml

2018-05-03 17:23:44 -05:00

.circleci

Remove unnecessary hyphen from restore_cache key (#7276 )

2018-04-28 11:20:30 +02:00

.github

…

app

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

2018-05-03 17:23:44 -05:00

bin

Upgrade Rails to version 5.2.0 (#5898 )

2018-04-12 14:45:17 +02:00

config

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

2018-05-03 17:23:44 -05:00

db: make schema.rb version subsume bookmarks migration.

2018-04-18 19:08:35 -05:00

docs

…

lib

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

2018-05-03 17:23:44 -05: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 remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05: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 remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05: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

…

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 remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

Gemfile.lock

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

2018-05-03 17:23:44 -05:00

jest.config.js

…

LICENSE

…

package.json

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

2018-04-18 18:48:12 -05:00

Procfile

…

Procfile.dev

Fix Procfile on OS X (#6748 )

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

Rakefile

Initial commit

2016-02-20 22:53:20 +01:00

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

Update react-redux to 5.0.7 to fix an issue with getDerivedStateFromProps

2018-04-27 01:24:55 +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%