T

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

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

2019-06-10 18:59:53 +02:00

.circleci

Fix CircleCI

2019-01-02 15:36:59 +01: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-06-10 18:59:53 +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-06-10 18:59:53 +02:00

Fix old migrations failing because of new version of strong_migrations (#11018 )

2019-06-09 22:55:28 +02:00

dist

Cache error 410 responses in recommended nginx configuration (#10425 )

2019-03-30 03:14:31 +01:00

lib

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

2019-06-10 18:59:53 +02:00

log

Initial commit

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

nanobox

…

public

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

2019-05-04 16:37:26 +02:00

spec

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

2019-06-10 18:59:53 +02:00

streaming

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

2019-05-24 15:23:52 +02:00

vendor

Increase files checked by ESLint (#9705 )

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

.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

Add audio length var to env sample

2019-06-03 16:16:21 +02:00

.env.test

…

.env.vagrant

…

.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

…

.gitmodules

Rename themes -> flavours ? ?

2017-12-03 23:26:40 -08:00

.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

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

…

.yarnclean

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

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

app.json

…

Aptfile

…

AUTHORS.md

Bump version to 2.8.0rc1 (#10340 )

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

babel.config.js

Weblate translations (2019-04-10) (#10545 )

2019-04-10 18:17:24 +02:00

boxfile.yml

…

Capfile

…

CHANGELOG.md

Bump version to 2.9.0rc1 (#11004 )

2019-06-09 15:53:08 +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-05-19 17:46:31 +02:00

docker-compose.yml

Upgrade redis in docker-compose.yml from 4 to 5 (#9063 )

2019-05-19 11:29:26 +02:00

Dockerfile

Docker: Remove dist-upgrade (#10822 )

2019-05-26 22:26:45 +02:00

Gemfile

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

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

Gemfile.lock

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

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

LICENSE

…

package.json

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

2019-06-07 17:00:36 +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

…

Procfile.dev

…

Rakefile

Initial commit

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

README.md

2019-01-28 22:57:42 +01:00

scalingo.json

…

Vagrantfile

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

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

yarn.lock

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

2019-06-04 20:40:19 +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%