Go to file

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

Conflicts:
- Dockerfile
  Took upstream version and reverted f13ebd02c9.
  Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
  The conflict was due to us raising the number of results returned.
  Upstream raised it further, so took it.
- config/locales/de.yml
  Took upstream changes to theme translation strings.
- config/locales/gl.yml
  Took upstream changes to theme translation strings.
- config/locales/nl.yml
  Took upstream changes to theme translation strings.
- config/locales/sk.yml
  Took upstream changes to theme translation strings.

2019-02-26 17:04:44 +01:00

.circleci

Fix CircleCI (#9695 )

2019-01-02 20:48:22 +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-02-26 17:04:44 +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-02-26 17:04:44 +01:00

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

2019-02-10 21:10:09 +01:00

dist

perf: run node directly when streaming (#10032 )

2019-02-13 18:52:36 +01:00

lib

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

2019-02-26 17:04:44 +01:00

log

…

nanobox

Update Nginx config for Nanobox apps (#9310 )

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

public

Change error graphic to hover-to-play (#10055 )

2019-02-15 23:33:25 +01:00

spec

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

2019-02-26 17:04:44 +01:00

streaming

Only stream local-only toots to logged-in users

2018-11-13 18:55:57 +01: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

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

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

…

.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

…

.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 Ruby to 2.6.1 (#9956 )

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

Bump version to 2.7.2 (#10067 )

2019-02-17 20:24:12 +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.7.3 (#10102 )

2019-02-23 22:20:20 +01:00

CODE_OF_CONDUCT.md

update code of conduct email address

2017-11-21 11:01:28 -05:00

config.ru

…

CONTRIBUTING.md

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

2019-01-28 21:14:47 +01:00

docker-compose.yml

Remove uneeded command and switch to images for TOR (#9438 )

2019-01-04 16:15:09 +01:00

Dockerfile

Fix fail health check due to missing wget (#10110 )

2019-02-25 04:06:24 +01:00

Gemfile

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

2019-02-26 17:04:44 +01:00

Gemfile.lock

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

2019-02-26 17:04:44 +01:00

jest.config.js

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

2019-02-01 16:12:20 +01:00

LICENSE

…

package.json

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

2019-01-19 18:28:37 +01: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

…

Procfile.dev

Fix Procfile on OS X (#6748 )

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

Rakefile

…

README.md

2019-01-28 22:57:42 +01: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-01-02 15:36:53 +01:00

yarn.lock

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

2019-01-19 18:28:37 +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%