T

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

Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.

2020-07-15 15:32:40 +02:00

.circleci

Fix the circleci packages for Buster. (#13583 )

2020-05-01 23:45:40 +02:00

.github

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

2020-06-30 23:00:20 +02:00

app

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

2020-07-15 15:32:40 +02:00

bin

Fix tootctl media remove-orphans choking on unknown files in storage (#13765 )

2020-05-15 18:41:27 +02:00

chart

helm: bump chart and default image version to 3.1.5 (#14256 )

2020-07-07 20:35:55 +02:00

config

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

2020-07-15 15:32:40 +02:00

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

2020-07-08 15:23:41 +02:00

dist

Update nginx.conf (#13066 )

2020-03-08 16:04:25 +01:00

lib

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

2020-07-15 15:32:40 +02:00

log

…

nanobox

…

public

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

2020-06-09 10:39:20 +02:00

spec

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

2020-07-15 15:32:40 +02:00

streaming

Fix streaming server only working for streams allowing local-only toots

2020-07-07 20:31:45 +02:00

vendor

…

.buildpacks

…

.codeclimate.yml

Bump rubocop from 0.79.0 to 0.82.0 (#13677 )

2020-05-08 20:24:26 +02:00

.dockerignore

…

.editorconfig

…

.env.nanobox

…

.env.production.sample

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

2020-07-15 15:32:40 +02:00

.env.test

…

.env.vagrant

Add a default DB_HOST to .env.vagrant for enable the streaming (#14030 )

2020-06-15 01:57:06 +02:00

.eslintignore

…

.eslintrc.js

Enable promise/catch-or-return allowFinally (#14289 )

2020-07-11 23:51:22 +02:00

.foreman

…

.gitattributes

…

.gitignore

Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191 )

2020-07-01 19:05:21 +02:00

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

…

.profile

…

.rspec

…

.rubocop.yml

Fix rubocop warning (#14288 )

2020-07-14 19:05:07 +02:00

.ruby-version

Update .ruby-version (#13395 )

2020-04-05 13:58:43 +02:00

.sass-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

…

Aptfile

…

AUTHORS.md

…

babel.config.js

…

boxfile.yml

…

Capfile

…

CHANGELOG.md

Bump version to 3.1.5 (#14284 )

2020-07-10 21:07:30 +02:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

…

crowdin.yml

…

docker-compose.yml

Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348) (#14016 )

2020-06-10 13:57:30 +02:00

Dockerfile

Update Dockerfile (#13582 )

2020-06-25 12:17:53 +02:00

Gemfile

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

2020-07-07 15:58:45 +02:00

Gemfile.lock

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

2020-07-07 15:58:45 +02:00

ide-helper.js

Add JS IDE helper (#13012 )

2020-04-27 17:19:53 +02:00

LICENSE

…

package.json

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

2020-07-08 15:23:41 +02:00

postcss.config.js

…

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

Fix translation platform to Crowdin (#13443 )

2020-04-10 08:24:23 +02:00

scalingo.json

…

SECURITY.md

Add Security Policy (#13946 )

2020-06-03 08:32:23 +02:00

Vagrantfile

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

2020-04-04 21:47:37 +02:00

yarn.lock

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

2020-07-08 15:23:41 +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%