Go to file

imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon

# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb

2018-02-23 23:28:31 +09:00

.github

Move files for GitHub to .github directory (#5989 )

2017-12-12 15:10:12 +01:00

app

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

bin

Update dependencies for Ruby (2017-10-30) (#5566 )

2017-10-31 12:22:32 +01:00

config

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

docs

…

lib

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

log

…

nanobox

[Nanobox] Apply Release Notes Changes (#5670 )

2017-11-15 16:26:53 +01:00

public

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

spec

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

streaming

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

2017-12-13 18:17:16 +00:00

vendor/assets

…

.babelrc

🎄🔨 Force tree shake emojione (#4202 )

2017-07-14 20:30:12 +02:00

.buildpacks

…

.codeclimate.yml

Upgrade ESLint to version 4.x (#6276 )

2018-01-17 16:57:15 +01:00

.dockerignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.editorconfig

…

.env.nanobox

[Nanobox] Apply Release Notes Changes (#5670 )

2017-11-15 16:26:53 +01:00

.env.production.sample

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

.env.test

…

.env.vagrant

…

.eslintignore

…

.eslintrc.yml

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

2018-01-17 16:17:10 +00:00

.foreman

…

.gitattributes

…

.gitignore

Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288 )

2017-10-09 20:51:24 +02:00

.gitmodules

Rename themes -> flavours ? ?

2017-12-03 23:26:40 -08:00

.haml-lint.yml

…

.nanoignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.nvmrc

…

.postcssrc.yml

Add object-fit polyfill for Edge (#4182 )

2017-07-14 01:59:34 +02:00

.profile

…

.rspec

…

.rubocop.yml

Add handling of Linked Data Signatures in payloads (#4687 )

2017-08-26 13:47:38 +02:00

.ruby-version

Add support Ruby v2.5.0 (#6097 )

2018-01-19 20:53:30 +01:00

.scss-lint.yml

…

.slugignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.travis.yml

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

2018-02-19 15:17:14 +00:00

.yarnclean

Reduce container size with clean yarn (#3506 )

2017-09-30 22:05:24 +02:00

app.json

Change logo URL for Heroku and Scalingo (#4476 )

2017-08-01 05:59:11 +02:00

Aptfile

Specify libicu explicitly in Aptfile (#4920 )

2017-09-13 09:30:13 +02:00

boxfile.yml

[Nanobox] Fix backups for file storage (#6483 )

2018-02-16 17:10:01 +01:00

Capfile

…

CODE_OF_CONDUCT.md

update code of conduct email address

2017-11-21 11:01:28 -05:00

config.ru

…

CONTRIBUTING.md

Added link to docs website

2017-07-14 09:42:50 -07:00

docker-compose.yml

Full-text search for authorized statuses (#6423 )

2018-02-09 23:04:47 +01:00

Dockerfile

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

Gemfile

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

Gemfile.lock

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

jest.config.js

Removed glitch tests

2017-11-17 19:29:17 -08:00

LICENSE

…

package.json

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

2018-01-17 16:17:10 +00:00

Procfile

…

Procfile.dev

Upgrade Webpacker to version 3.0.1 (#5122 )

2017-09-27 14:41:54 +02:00

Rakefile

…

README.md

fix Code Climate badge on README.md (#5671 )

2017-11-13 11:49:54 +09:00

scalingo.json

Change logo URL for Heroku and Scalingo (#4476 )

2017-08-01 05:59:11 +02:00

stack-fix.c

dockerfile: Give more stack space to /sbin/tini.

2018-01-11 04:09:16 -06:00

Vagrantfile

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

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

yarn.lock

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

2018-01-17 16:17:10 +00: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%