A glitchy but lovable microblogging server
Go to file
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
2019-02-17 12:26:55 +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-02-17 12:26:55 +01:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2019-02-15 18:02:45 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +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-01-28 21:14:47 +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-02-17 12:26:55 +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
.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
.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 Add translators to AUTHORS.md (#9865) 2019-01-19 22:01:12 +01:00
babel.config.js
boxfile.yml
Capfile
CHANGELOG.md Bump version to 2.7.1 (#9932) 2019-01-28 04:24:12 +01:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-01-28 21:14:47 +01: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-02-10 21:10:09 +01:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-02-15 18:02:45 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-02-15 18:02:45 +01:00
jest.config.js Merge branch 'master' into glitch-soc/merge-upstream 2019-02-01 16:12:20 +01:00
LICENSE
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
Procfile
Procfile.dev
Rakefile
README.md Bumps copyright year in README.md to 2019 (#9939) 2019-01-28 22:57:42 +01: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-19 18:28:37 +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?