Go to file

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

Initial commit

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

nanobox

Resync Nanobox files with the 2.9.0 release (#11083 )

2019-06-14 14:52:31 +02:00

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

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.buildpacks

Add ffmpeg buildpack for scalingo (#8500 )

2018-08-29 01:21:23 +02:00

.codeclimate.yml

Bump rubocop from 0.79.0 to 0.82.0 (#13677 )

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

.dockerignore

Add .bundle to .dockerignore (#7895 )

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

.editorconfig

Add final newline to locale files (#2890 )

2017-05-07 19:55:47 +02:00

.env.nanobox

Fix sample SAML_ACS_URL, SAML_ISSUER (#12669 )

2019-12-23 18:12:22 +01:00

.env.production.sample

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

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

.env.test

Bump webpacker from 4.0.7 to 4.2.0 (#12416 )

2019-11-20 17:56:11 +01:00

.env.vagrant

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

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

.eslintignore

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.eslintrc.js

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

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

.foreman

Replace sprockets/browserify with Webpack (#2617 )

2017-05-03 02:04:16 +02:00

.gitattributes

Add .gitattributes file to avoid unwanted CRLF (#3954 )

2017-06-26 13:15:24 +02:00

.gitignore

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

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

.gitmodules

Rename themes -> flavours ? ?

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

.haml-lint.yml

Added haml-lint and fix warnings (#2773 )

2017-05-08 03:35:25 +02:00

.nanoignore

Remove Storybook (#4397 )

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

.nvmrc

Upgrade .nvmrc to Node.js 12 (#12906 )

2020-01-21 12:42:13 +01:00

.profile

Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276 )

2017-05-24 17:57:33 +02:00

.rspec

Adding a Mention model, test stubs

2016-02-25 00:17:01 +01:00

.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

Fix sass-lint config (#10982 )

2019-06-06 18:51:46 +02:00

.slugignore

Remove Storybook (#4397 )

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

.yarnclean

Replace from scss-lint to sass-lint (#10958 )

2019-06-04 17:23:18 +02:00

app.json

Remove deprecated config from Heroku and Scalingo (#11925 )

2019-09-23 12:11:59 +02:00

Aptfile

Adjust Aptfile for Heroku-18 stack (#8588 )

2018-09-09 02:10:58 +02:00

AUTHORS.md

Update AUTHORS.md (#12096 )

2019-10-07 04:36:32 +02:00

babel.config.js

Remove unnecessary dependencies (#12533 )

2019-12-02 13:38:53 +01:00

boxfile.yml

Correct the Nanobox deploy hooks for order and context (#12663 )

2019-12-22 08:55:27 +01:00

Capfile

remove capistrano/faster_assets from Capfile (#2737 )

2017-05-03 12:14:52 +02:00

CHANGELOG.md

Bump version to 3.1.5 (#14284 )

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

CODE_OF_CONDUCT.md

Change e-mail contact for CoC enforcement

2019-06-06 17:42:07 +02:00

config.ru

Fix rubocop issues, introduce usage of frozen literal to improve performance

2016-11-15 16:56:29 +01:00

CONTRIBUTING.md

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

2019-11-20 15:36:09 +01:00

crowdin.yml

Update Crowdin configuration file

2019-09-14 11:40:13 +02:00

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

Fix #49 - License changed from GPL-2.0 to AGPL-3.0

2016-09-21 23:04:34 +02:00

package.json

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

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

postcss.config.js

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

priv-config

TOR federation (#7875 )

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

Procfile

Bind servers to 0.0.0.0 in Procfile (#11378 )

2019-07-22 06:16:30 +02:00

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

Fix translation platform to Crowdin (#13443 )

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

scalingo.json

Remove deprecated config from Heroku and Scalingo (#11925 )

2019-09-23 12:11:59 +02:00

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%