Go to file
ThibG 45e4c90a23
Merge pull request #953 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-11 13:23:54 +01:00
.circleci Fix CircleCI (#9695) 2019-01-02 20:48:22 +01:00
.github Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
app Merge pull request #953 from ThibG/glitch-soc/merge-upstream 2019-03-11 13:23:54 +01:00
bin Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
config Merge branch 'master' into glitch-soc/merge-upstream 2019-03-08 20:15:57 +01:00
db Fix AddLockVersionToPolls migration (#10200) 2019-03-07 01:50:06 +01:00
dist perf: run node directly when streaming (#10032) 2019-02-13 18:52:36 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
log
nanobox Update Nginx config for Nanobox apps (#9310) 2018-11-20 22:24:35 +01:00
public Change error graphic to hover-to-play (#10055) 2019-02-15 23:33:25 +01:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-03-10 16:48:44 +01:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.buildpacks Add ffmpeg buildpack for scalingo (#8500) 2018-08-29 01:21:23 +02:00
.codeclimate.yml Upgrade ESLint to v5.x (#9694) 2019-01-02 07:28:53 +01:00
.dockerignore
.editorconfig
.env.nanobox Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423) 2018-08-25 13:27:08 +02:00
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
.env.test Do not test PAM authentication by default (#9027) 2018-10-20 07:32:26 +02:00
.env.vagrant update vagrant configs (#8706) 2018-09-16 14:49:15 -04:00
.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 Move more tasks to tootctl (#8675) 2018-09-14 17:42:22 +02:00
.ruby-version Upgrade Ruby to 2.6.1 (#9956) 2019-02-20 11:57:08 +01:00
.scss-lint.yml
.slugignore
.yarnclean
AUTHORS.md Bump version to 2.7.2 (#10067) 2019-02-17 20:24:12 +01:00
Aptfile Adjust Aptfile for Heroku-18 stack (#8588) 2018-09-09 02:10:58 +02:00
CHANGELOG.md Bump version to 2.7.4 (#10179) 2019-03-05 18:22:46 +01:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-01-28 21:14:47 +01:00
Capfile
Dockerfile Re-organize Dockerfile to improve incremental builds. (#10212) 2019-03-08 16:12:48 +01:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 11:29:06 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-03-08 20:15:57 +01:00
LICENSE
Procfile
Procfile.dev
README.md Bumps copyright year in README.md to 2019 (#9939) 2019-01-28 22:57:42 +01:00
Rakefile
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2019-03-10 16:48:44 +01:00
app.json
babel.config.js Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
boxfile.yml
config.ru
docker-compose.yml Remove uneeded command and switch to images for TOR (#9438) 2019-01-04 16:15:09 +01:00
jest.config.js Merge branch 'master' into glitch-soc/merge-upstream 2019-02-01 16:12:20 +01:00
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-01-19 18:28:37 +01:00
postcss.config.js Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
priv-config
scalingo.json Add ffmpeg buildpack for scalingo (#8500) 2018-08-29 01:21:23 +02:00
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-01-19 18:28:37 +01: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?