The glaceon.social flavour of glitch-soc, a Mastodon fork
Go to file
Thibaut Girka 9101254d0a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
2020-04-05 18:32:06 +02:00
.circleci Update config.yml (#13379) 2020-04-04 15:52:42 +02:00
.dependabot
…
.github
…
app Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
bin
…
config Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
dist Update nginx.conf (#13066) 2020-03-08 16:04:25 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
log
…
nanobox
…
public
…
spec Merge branch 'master' into glitch-soc/merge-upstream 2020-04-04 21:47:37 +02:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2020-01-25 10:04:41 +01:00
vendor
…
.buildpacks
…
.codeclimate.yml
…
.dockerignore Add .bundle to .dockerignore (#7895) 2018-06-26 20:33:29 +02:00
.editorconfig
…
.env.nanobox
…
.env.production.sample Add environment variable to specify extra data hosts 2020-02-06 12:15:15 +01:00
.env.test
…
.env.vagrant
…
.eslintignore
…
.eslintrc.js
…
.foreman
…
.gitattributes
…
.gitignore
…
.gitmodules
…
.haml-lint.yml
…
.nanoignore
…
.nvmrc
…
.profile
…
.rspec
…
.rubocop.yml
…
.ruby-version Update .ruby-version (#13395) 2020-04-05 13:58:43 +02:00
.sass-lint.yml
…
.slugignore
…
.yarnclean
…
AUTHORS.md
…
Aptfile
…
CHANGELOG.md Update CHANGELOG.md (#13397) 2020-04-05 15:18:41 +02:00
CODE_OF_CONDUCT.md
…
CONTRIBUTING.md
…
Capfile
…
Dockerfile [Security] Update Dockerfile for Ruby 2.6.6 (#13393) 2020-04-05 12:52:07 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
LICENSE
…
Procfile
…
Procfile.dev
…
README.md Decommission support for Ruby 2.4 (#13287) 2020-03-21 03:10:24 +01:00
Rakefile
…
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2020-04-04 21:47:37 +02:00
app.json
…
babel.config.js
…
boxfile.yml
…
config.ru
…
crowdin.yml
…
docker-compose.yml
…
package.json Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
postcss.config.js
…
priv-config
…
scalingo.json
…
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02: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?