Go to file

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

Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.

2018-08-10 16:22:31 +02:00

.circleci

Use workspace instead of caching for built assets

2018-07-30 22:25:22 +02:00

.github

…

app

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

2018-08-10 16:22:31 +02:00

bin

Add symbolic link for yarnpkg (#7894 )

2018-06-26 20:34:01 +02:00

config

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

2018-08-10 16:22:31 +02:00

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

2018-08-10 16:22:31 +02:00

docs

…

lib

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

2018-08-01 00:18:13 +02:00

log

…

nanobox

…

public

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

2018-07-09 07:13:59 +02:00

spec

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

2018-08-10 16:22:31 +02:00

streaming

Fix streaming API still using filtered instead of chosen languages (#8009 )

2018-07-14 03:59:31 +02:00

vendor/assets

…

.babelrc

…

.buildpacks

…

.codeclimate.yml

fix RuboCop error (#7442 )

2018-06-04 14:49:10 +02:00

.dockerignore

Add .bundle to .dockerignore (#7895 )

2018-06-26 20:33:29 +02:00

.editorconfig

…

.env.nanobox

…

.env.production.sample

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

2018-07-09 07:13:59 +02:00

.env.test

…

.env.vagrant

…

.eslintignore

…

.eslintrc.yml

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

2018-06-02 16:15:36 -05:00

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

Upgrade Node.js to v8.x on nvmrc (#8023 )

2018-07-15 12:29:17 +09:00

.postcssrc.yml

…

.profile

…

.rspec

…

.rubocop.yml

fix RuboCop error (#7442 )

2018-06-04 14:49:10 +02:00

.ruby-version

…

.scss-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

…

Aptfile

Add dependencies for uWebSockets (#7466 )

2018-07-14 01:47:10 +02:00

AUTHORS.md

…

boxfile.yml

…

Capfile

…

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

…

docker-compose.yml

Update docker-compose to cope with build-time assets (#8156 )

2018-08-09 22:37:48 +02:00

Dockerfile

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

2018-07-16 14:50:42 +02:00

Gemfile

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

2018-06-15 20:51:39 +02:00

Gemfile.lock

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

2018-06-21 20:49:57 +02:00

jest.config.js

…

LICENSE

…

package.json

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

2018-08-01 00:18:13 +02:00

priv-config

TOR federation (#7875 )

2018-06-26 20:34:12 +02:00

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

Remove reference to BTC, update video link

2018-07-05 21:02:21 +02:00

scalingo.json

Fix Unknown addon provider in scalingo.json (#7928 )

2018-07-03 09:09:21 +02:00

stack-fix.c

…

Vagrantfile

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

2018-08-01 22:20:25 +02:00

yarn.lock

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

2018-08-01 00:18:13 +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 47.6%

JavaScript 23.7%

TypeScript 14.7%

SCSS 8.8%

Haml 3.2%

Other 2%