A glitchy but lovable microblogging server
Go to file
Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	.circleci/config.yml
	app/controllers/authorize_follows_controller.rb
	app/javascript/packs/public.js

Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.
2018-08-18 18:04:49 +02:00
.circleci Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
bin Add symbolic link for yarnpkg (#7894) 2018-06-26 20:34:01 +02:00
config Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
docs
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
log
nanobox
public Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
streaming Fix streaming API still using filtered instead of chosen languages (#8009) 2018-07-14 03:59:31 +02:00
vendor/assets
.babelrc
.buildpacks
.codeclimate.yml fix RuboCop error (#7442) 2018-06-04 14:49:10 +02:00
.dockerignore Add .bundle to .dockerignore (#7895) 2018-06-26 20:33:29 +02:00
.editorconfig
.env.nanobox
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.yml Merge remote-tracking branch 'origin/master' into gs-master 2018-06-02 16:15:36 -05:00
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc Upgrade Node.js to v8.x on nvmrc (#8023) 2018-07-15 12:29:17 +09:00
.postcssrc.yml
.profile
.rspec
.rubocop.yml Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
.ruby-version
.scss-lint.yml
.slugignore
.yarnclean Reduce container size with clean yarn (#3506) 2017-09-30 22:05:24 +02:00
app.json
Aptfile Add dependencies for uWebSockets (#7466) 2018-07-14 01:47:10 +02:00
AUTHORS.md
boxfile.yml
Capfile
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
docker-compose.yml Update docker-compose to cope with build-time assets (#8156) 2018-08-09 22:37:48 +02:00
Dockerfile Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
Gemfile Temporarily revert doorkeeper back to 4.2.6 2018-08-17 17:50:38 +02:00
Gemfile.lock Temporarily revert doorkeeper back to 4.2.6 2018-08-17 17:50:38 +02:00
jest.config.js
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
priv-config TOR federation (#7875) 2018-06-26 20:34:12 +02:00
Procfile
Procfile.dev
Rakefile
README.md Remove reference to BTC, update video link 2018-07-05 21:02:21 +02:00
scalingo.json Fix Unknown addon provider in scalingo.json (#7928) 2018-07-03 09:09:21 +02:00
stack-fix.c
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 22:20:25 +02:00
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02: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?