Go to file

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

Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml

2019-08-07 13:56:48 +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

…

app

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

2019-08-07 13:56:48 +02:00

bin

…

config

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

2019-08-07 13:56:48 +02:00

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

2019-08-06 13:16:53 +02:00

dist

…

lib

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

2019-08-05 13:13:28 +02:00

log

…

nanobox

Resync Nanobox files with the 2.9.0 release (#11083 )

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

public

…

spec

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

2019-08-07 13:56:48 +02:00

streaming

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

2019-07-30 12:22:33 +02:00

vendor

…

.buildpacks

…

.codeclimate.yml

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

2019-06-04 17:23:18 +02:00

.dockerignore

…

.editorconfig

…

.env.nanobox

…

.env.production.sample

Added max search results var to sample env

2019-07-20 16:39:48 +02:00

.env.test

…

.env.vagrant

…

.eslintignore

…

.eslintrc.js

…

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

…

.profile

…

.rspec

…

.rubocop.yml

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

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

.ruby-version

…

.sass-lint.yml

Fix sass-lint config (#10982 )

2019-06-06 18:51:46 +02:00

.slugignore

…

.yarnclean

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

2019-06-04 17:23:18 +02:00

app.json

…

Aptfile

…

AUTHORS.md

…

babel.config.js

New Crowdin translations (#11077 )

2019-06-18 22:58:18 +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-07 13:56:48 +02:00

Gemfile.lock

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

2019-08-07 13:56:48 +02:00

LICENSE

…

package.json

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

2019-08-05 13:13:28 +02:00

postcss.config.js

…

priv-config

…

Procfile

Bind servers to 0.0.0.0 in Procfile (#11378 )

2019-07-22 06:16:30 +02:00

Procfile.dev

…

Rakefile

…

README.md

Change translations badge in README to Crowdin (#11054 )

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

scalingo.json

…

Vagrantfile

…

yarn.lock

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

2019-08-05 13:13:28 +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 44.8%

TypeScript 29.5%

JavaScript 13.7%

SCSS 7.5%

Haml 2.9%

Other 1.6%