Go to file

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

Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.

2019-08-30 13:38:41 +02:00

.circleci

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

2019-06-16 21:09:19 +02:00

.dependabot

Change dependabot update schedule from live to weekly (#10949 )

2019-06-04 11:23:19 +02:00

.github

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

2019-05-23 19:01:30 +02:00

app

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

2019-08-30 13:38:41 +02:00

bin

Bump webpacker from 3.5.5 to 4.0.2 (#10277 )

2019-03-15 15:05:31 +01:00

config

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

2019-08-30 13:38:41 +02:00

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

2019-08-29 12:07:50 +02:00

dist

Add TLS v1.3 support (#11603 )

2019-08-30 07:42:50 +02:00

lib

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

2019-08-19 21:49:35 +02:00

log

…

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

2019-08-19 21:49:35 +02:00

spec

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

2019-08-30 13:38:41 +02:00

streaming

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

2019-07-30 12:22:33 +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

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

2019-06-04 17:23:18 +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

Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423 )

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

.env.production.sample

Added max search results var to sample env

2019-07-20 16:39:48 +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

Increase files checked by ESLint (#9705 )

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

.eslintrc.js

Refactor icons in web UI to use Icon component (#9951 )

2019-02-01 00:14:05 +01:00

.foreman

…

.gitattributes

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

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

.gitignore

Ignore elasticsearch directory (#7070 )

2018-04-08 16:57:16 +09: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 Node.js to v8.x on nvmrc (#8023 )

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

.profile

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

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

.rspec

…

.rubocop.yml

require rubocop-rails in .rubocop.yml (#10974 )

2019-06-06 12:31:48 +02:00

.ruby-version

Upgrade Ruby to 2.6.1 (#9956 )

2019-02-20 11:57:08 +01: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

Change logo URL for Heroku and Scalingo (#4476 )

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

Aptfile

Adjust Aptfile for Heroku-18 stack (#8588 )

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

AUTHORS.md

Bump version to 2.8.0rc1 (#10340 )

2019-03-30 02:13:42 +01:00

babel.config.js

Fix tesseract.js being part of the common chunk (#11571 )

2019-08-15 17:24:45 +02:00

boxfile.yml

Resync Nanobox files with the 2.9.0 release (#11083 )

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

Capfile

…

CHANGELOG.md

Fix unconverted PRs in the changelog (#11155 )

2019-06-22 18:13:52 +02:00

CODE_OF_CONDUCT.md

Change e-mail contact for CoC enforcement

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

config.ru

…

CONTRIBUTING.md

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

2019-06-16 21:09:19 +02:00

crowdin.yml

Update crowdin.yml

2019-06-12 15:11:00 +02:00

docker-compose.yml

Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351 )

2019-07-18 20:28:05 +02:00

Dockerfile

Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351 )

2019-07-18 20:28:05 +02:00

Gemfile

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

2019-08-30 13:38:41 +02:00

Gemfile.lock

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

2019-08-30 13:38:41 +02:00

LICENSE

…

package.json

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

2019-08-30 13:38: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

…

README.md

Change translations badge in README to Crowdin (#11054 )

2019-06-12 15:56:41 +02:00

scalingo.json

Add ffmpeg buildpack for scalingo (#8500 )

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

Vagrantfile

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

2019-03-10 16:48:44 +01:00

yarn.lock

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

2019-08-29 12:07:50 +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%