mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00

Go to file

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

Conflicts:
	.circleci/config.yml
	app/controllers/authorize_follows_controller.rb
	app/javascript/packs/public.js

Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.

2018-08-18 18:04:49 +02:00

.circleci

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

2018-08-18 18:04:49 +02:00

.github

Multiple Issue templates (#7402 )

2018-05-08 13:35:33 +02:00

app

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

2018-08-18 18:04:49 +02:00

bin

Add symbolic link for yarnpkg (#7894 )

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

config

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

2018-08-18 18:04:49 +02:00

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

2018-08-18 18:04:49 +02:00

docs

Fix redirect link on Tuning.md (#1595 )

2017-04-12 12:40:37 +02:00

lib

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

2018-08-17 17:43:54 +02:00

log

…

nanobox

[Nanobox] Tuning Update (#6660 )

2018-03-06 21:59:35 +01:00

public

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

2018-07-09 07:13:59 +02:00

spec

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

2018-08-18 18:04:49 +02:00

streaming

Fix streaming API still using filtered instead of chosen languages (#8009 )

2018-07-14 03:59:31 +02:00

vendor/assets

…

.babelrc

Remove debug option from Babel preset env (#6852 )

2018-03-21 10:26:15 +01:00

.buildpacks

Add heroku APT buildpack for scalingo. (#3051 )

2017-05-14 12:57:13 +02:00

.codeclimate.yml

fix RuboCop error (#7442 )

2018-06-04 14:49:10 +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

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

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

.env.production.sample

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

2018-08-17 17:43:54 +02:00

.env.test

Add parallel test processors (#7215 )

2018-04-21 21:36:22 +02:00

.env.vagrant

…

.eslintignore

Dev Tooling fixes (eslint/editorconfig) (#1398 )

2017-04-11 00:36:03 +02:00

.eslintrc.yml

Merge remote-tracking branch 'origin/master' into gs-master

2018-06-02 16:15:36 -05: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

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

.postcssrc.yml

Add object-fit polyfill for Edge (#4182 )

2017-07-14 01:59:34 +02: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

Add post-deployment migration system (#8182 )

2018-08-13 18:17:20 +02:00

.ruby-version

Update Ruby to version 2.4.4 (#6964 )

2018-04-01 23:43:08 +02:00

.scss-lint.yml

Enable CodeClimate SCSS Lint checks (#2886 )

2017-05-07 20:47:31 +02:00

.slugignore

Remove Storybook (#4397 )

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

.yarnclean

Reduce container size with clean yarn (#3506 )

2017-09-30 22:05:24 +02:00

app.json

Change logo URL for Heroku and Scalingo (#4476 )

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

Aptfile

Add dependencies for uWebSockets (#7466 )

2018-07-14 01:47:10 +02:00

AUTHORS.md

docs: Add AUTHORS file (#6685 )

2018-03-09 13:11:43 +01:00

boxfile.yml

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

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

Capfile

remove capistrano/faster_assets from Capfile (#2737 )

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

CODE_OF_CONDUCT.md

update code of conduct email address

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

config.ru

…

CONTRIBUTING.md

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-04 12:16:12 -05:00

docker-compose.yml

Update docker-compose to cope with build-time assets (#8156 )

2018-08-09 22:37:48 +02:00

Dockerfile

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

2018-07-16 14:50:42 +02:00

Gemfile

Temporarily revert doorkeeper back to 4.2.6

2018-08-17 17:50:38 +02:00

Gemfile.lock

Temporarily revert doorkeeper back to 4.2.6

2018-08-17 17:50:38 +02:00

jest.config.js

Removed glitch tests

2017-11-17 19:29:17 -08:00

LICENSE

…

package.json

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

2018-08-01 00:18:13 +02:00

priv-config

TOR federation (#7875 )

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

Procfile

More robust PuSH subscription refreshes (#2799 )

2017-05-05 02:23:01 +02:00

Procfile.dev

Fix Procfile on OS X (#6748 )

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

Rakefile

…

README.md

Remove reference to BTC, update video link

2018-07-05 21:02:21 +02:00

scalingo.json

Fix Unknown addon provider in scalingo.json (#7928 )

2018-07-03 09:09:21 +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

2018-08-01 22:20:25 +02:00

yarn.lock

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

2018-08-01 00:18:13 +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 49%

TypeScript 23.8%

JavaScript 17.2%

SCSS 6.5%

Haml 3.2%

Other 0.3%