Go to file
ThibG 221bb05cf8
Merge pull request #1219 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-09-15 14:45:24 +02:00
.circleci Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02: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 [Glitch] Add timeline read markers API 2019-09-13 20:28:22 +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-09-13 18:13:43 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
dist Add TLS v1.3 support (#11603) 2019-08-30 07:42:50 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
log
nanobox Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
public Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
spec Fix tests being broken because of different default setting 2019-09-13 20:28:22 +02:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +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 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
.env.test Do not test PAM authentication by default (#9027) 2018-10-20 07:32:26 +02:00
.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
.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
AUTHORS.md Bump version to 2.8.0rc1 (#10340) 2019-03-30 02:13:42 +01:00
Aptfile
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
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
Capfile
Dockerfile Use prebuilt node.js on Docker image (#11768) 2019-09-07 05:12:20 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
LICENSE
Procfile Bind servers to 0.0.0.0 in Procfile (#11378) 2019-07-22 06:16:30 +02:00
Procfile.dev
README.md Change translations badge in README to Crowdin (#11054) 2019-06-12 15:56:41 +02:00
Rakefile
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2019-03-10 16:48:44 +01:00
app.json
babel.config.js Fix tesseract.js being part of the common chunk (#11571) 2019-08-15 17:24:45 +02:00
boxfile.yml Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
config.ru
crowdin.yml Update crowdin.yml 2019-06-12 15:11:00 +02:00
docker-compose.yml Add healthcheck endpoint for web (#11770) 2019-09-07 02:47:51 +02:00
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
postcss.config.js Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
priv-config
scalingo.json
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status

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?