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

Go to file

David Yip 020b40efdb Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml

2018-02-09 09:25:53 -06:00

.github

Move files for GitHub to .github directory (#5989 )

2017-12-12 15:10:12 +01:00

app

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-09 09:25:53 -06:00

bin

Update dependencies for Ruby (2017-10-30) (#5566 )

2017-10-31 12:22:32 +01:00

config

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-09 09:25:53 -06:00

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-08 23:17:14 +00:00

docs

Fix redirect link on Tuning.md (#1595 )

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

lib

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-04 03:17:11 +00:00

log

Initial commit

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

nanobox

[Nanobox] Apply Release Notes Changes (#5670 )

2017-11-15 16:26:53 +01:00

public

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

spec

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-08 23:17:14 +00:00

streaming

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-13 18:17:16 +00:00

vendor/assets

Initial commit

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

.babelrc

🎄🔨 Force tree shake emojione (#4202 )

2017-07-14 20:30:12 +02:00

.buildpacks

Add heroku APT buildpack for scalingo. (#3051 )

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

.codeclimate.yml

Upgrade ESLint to version 4.x (#6276 )

2018-01-17 16:57:15 +01:00

.dockerignore

Remove Storybook (#4397 )

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

.editorconfig

Add final newline to locale files (#2890 )

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

.env.nanobox

[Nanobox] Apply Release Notes Changes (#5670 )

2017-11-15 16:26:53 +01:00

.env.production.sample

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

.env.test

Add recovery code support for two-factor auth (#1773 )

2017-04-15 13:26:03 +02:00

.env.vagrant

Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant

2017-01-26 19:22:59 +11:00

.eslintignore

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

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

.eslintrc.yml

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00: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

Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288 )

2017-10-09 20:51:24 +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

update Node to 6.x LTS (#1228 )

2017-04-15 02:05:41 +02: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

Adding a Mention model, test stubs

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

.rubocop.yml

Add handling of Linked Data Signatures in payloads (#4687 )

2017-08-26 13:47:38 +02:00

.ruby-version

Add support Ruby v2.5.0 (#6097 )

2018-01-19 20:53:30 +01: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

.travis.yml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-09 09:25:53 -06: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

Specify libicu explicitly in Aptfile (#4920 )

2017-09-13 09:30:13 +02:00

boxfile.yml

[Nanobox] Apply Release Notes Changes (#5670 )

2017-11-15 16:26:53 +01: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

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

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

CONTRIBUTING.md

Added link to docs website

2017-07-14 09:42:50 -07:00

docker_entrypoint.sh

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

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

docker-compose.yml

Isolate internal services from external networks in Docker configuration (#6369 )

2018-02-03 18:44:22 +01:00

Dockerfile

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-19 15:22:10 -06:00

Gemfile

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

Gemfile.lock

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

jest.config.js

Removed glitch tests

2017-11-17 19:29:17 -08: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 remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00:00

Procfile

More robust PuSH subscription refreshes (#2799 )

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

Procfile.dev

Upgrade Webpacker to version 3.0.1 (#5122 )

2017-09-27 14:41:54 +02:00

Rakefile

Initial commit

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

README.md

fix Code Climate badge on README.md (#5671 )

2017-11-13 11:49:54 +09:00

scalingo.json

Change logo URL for Heroku and Scalingo (#4476 )

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

stack-fix.c

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

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

Vagrantfile

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

yarn.lock

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00: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%