Go to file

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

Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock

2019-01-02 15:36:53 +01:00

.circleci

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

2019-01-02 15:36:53 +01:00

.github

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

2018-10-22 17:51:38 +02:00

app

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

2019-01-02 15:36:53 +01:00

bin

Upgrade Babel to version 7.0.0 (#5925 )

2018-09-14 17:59:48 +02:00

config

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

2019-01-02 15:36:53 +01:00

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

2019-01-02 15:36:53 +01:00

dist

Add nginx and systemd templates (#8770 )

2018-09-24 16:46:05 +02:00

lib

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

2019-01-02 15:36:53 +01:00

log

…

nanobox

Update Nginx config for Nanobox apps (#9310 )

2018-11-20 22:24:35 +01:00

public

Replace animated oops.gif by a non-animated image

2018-12-19 20:49:58 +01:00

spec

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

2019-01-02 15:36:53 +01:00

streaming

Only stream local-only toots to logged-in users

2018-11-13 18:55:57 +01:00

vendor/assets

…

.buildpacks

Add ffmpeg buildpack for scalingo (#8500 )

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

.codeclimate.yml

Upgrade ESLint to v5.x (#9694 )

2019-01-02 07:28:53 +01:00

.dockerignore

Add .bundle to .dockerignore (#7895 )

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

.editorconfig

…

.env.nanobox

Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423 )

2018-08-25 13:27:08 +02:00

.env.production.sample

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

2018-08-26 14:23:24 +02:00

.env.test

Do not test PAM authentication by default (#9027 )

2018-10-20 07:32:26 +02:00

.env.vagrant

update vagrant configs (#8706 )

2018-09-16 14:49:15 -04:00

.eslintignore

…

.eslintrc.yml

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

2019-01-02 15:36:53 +01:00

.foreman

…

.gitattributes

…

.gitignore

Ignore elasticsearch directory (#7070 )

2018-04-08 16:57:16 +09:00

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

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

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

.profile

…

.rspec

…

.rubocop.yml

Move more tasks to tootctl (#8675 )

2018-09-14 17:42:22 +02:00

.ruby-version

Upgrade default Ruby version to 2.6.0 (#9688 )

2019-01-01 16:40:17 +01:00

.scss-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

…

Aptfile

Adjust Aptfile for Heroku-18 stack (#8588 )

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

AUTHORS.md

Update AUTHORS.md (#9141 )

2018-10-29 14:05:53 +01:00

babel.config.js

Upgrade Babel to version 7.0.0 (#5925 )

2018-09-14 17:59:48 +02:00

boxfile.yml

[Nanobox] Enable ElasticSearch support by default (#6977 )

2018-03-31 13:17:25 +02:00

Capfile

…

CHANGELOG.md

Bump version to 2.6.5 (#9413 )

2018-12-02 17:41:38 +01:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

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

2018-10-22 17:51:38 +02:00

docker-compose.yml

Add healthcheck commands to docker-compose.yml (#9143 )

2018-12-29 00:43:41 +01:00

Dockerfile

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

2019-01-02 15:36:53 +01:00

Gemfile

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

2019-01-02 15:36:53 +01:00

Gemfile.lock

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

2019-01-02 15:36:53 +01:00

jest.config.js

…

LICENSE

…

package.json

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

2019-01-02 15:36:53 +01:00

postcss.config.js

Update dependencies for Node.js (2018-12-31) (#9669 )

2018-12-31 18:11:48 +01:00

priv-config

TOR federation (#7875 )

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

Procfile

…

Procfile.dev

Fix Procfile on OS X (#6748 )

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

Rakefile

…

README.md

Improve README (#9012 )

2018-10-19 18:49:35 +02:00

scalingo.json

Add ffmpeg buildpack for scalingo (#8500 )

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

stack-fix.c

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

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

Vagrantfile

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

2019-01-02 15:36:53 +01:00

yarn.lock

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

2019-01-02 15:36:53 +01: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%