Your self-hosted, globally interconnected microblogging community
Go to file
Thibaut Girka dbe311f0e9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/simple_form.pl.yml
2019-01-16 14:20:07 +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 branch 'master' into glitch-soc/merge-upstream 2019-01-16 14:20:07 +01:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2019-01-16 14:20:07 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-01-16 14:20:07 +01:00
log
nanobox Update Nginx config for Nanobox apps (#9310) 2018-11-20 22:24:35 +01:00
public Replace animated oops.gif by a non-animated image 2018-12-19 20:49:58 +01:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-01-16 14:20:07 +01:00
streaming Only stream local-only toots to logged-in users 2018-11-13 18:55:57 +01:00
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.buildpacks
.codeclimate.yml Upgrade ESLint to v5.x (#9694) 2019-01-02 07:28:53 +01:00
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.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 Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.profile
.rspec
.rubocop.yml
.ruby-version Upgrade default Ruby version to 2.6.0 (#9688) 2019-01-01 16:40:17 +01:00
.scss-lint.yml
.slugignore
.yarnclean
app.json
Aptfile
AUTHORS.md Update AUTHORS (#9764) 2019-01-08 18:17:56 +01:00
babel.config.js
boxfile.yml
Capfile
CHANGELOG.md Update changelog for 2.7.0rc1 (#9763) 2019-01-08 18:12:10 +01:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
docker-compose.yml Remove uneeded command and switch to images for TOR (#9438) 2019-01-04 16:15:09 +01:00
Dockerfile Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-01-16 14:20:07 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-01-16 14:20:07 +01:00
jest.config.js
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
postcss.config.js Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
priv-config
Procfile
Procfile.dev
Rakefile
README.md Improve README (#9012) 2018-10-19 18:49:35 +02:00
scalingo.json
stack-fix.c
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00

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?