A glitchy but lovable microblogging server
Go to file
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
.circleci Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +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 2018-12-09 16:08:04 +01:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-12-06 12:44:38 +01:00
log
nanobox Update Nginx config for Nanobox apps (#9310) 2018-11-20 22:24:35 +01:00
public
spec Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
streaming Only stream local-only toots to logged-in users 2018-11-13 18:55:57 +01:00
vendor/assets
.buildpacks
.codeclimate.yml
.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
.eslintrc.yml
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.postcssrc.yml
.profile
.rspec
.rubocop.yml
.ruby-version Use Ruby ==2.5.2== 2.5.3 (#9003) 2018-10-18 22:32:47 +02:00
.scss-lint.yml
.slugignore
.yarnclean
app.json
Aptfile
AUTHORS.md Update AUTHORS.md (#9141) 2018-10-29 14:05:53 +01:00
babel.config.js
boxfile.yml
Capfile
CHANGELOG.md Bump version to 2.6.5 (#9413) 2018-12-02 17:41:38 +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 Persist volumes by default in docker-compose (#9055) 2018-10-23 00:08:25 +02:00
Dockerfile Merge branch 'master' into glitch-soc/merge-upstream 2018-10-23 17:15:57 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2018-12-06 12:44:38 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
jest.config.js
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2018-11-30 20:16:26 +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
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-11-30 20:16:26 +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?