You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
ketudb d13df371dd
Merge branch 'plural-2020.11.18' into main
6 days ago
.circleci Set bundle config in local file, and set path (#14351) 4 months ago
.github Merge branch 'master' into glitch-soc/merge-upstream 4 months ago
app Merge branch 'plural-2020.11.18' into main 6 days ago
bin fix: make Procfile compatible with herokuish (#12685) 2 months ago
chart helm: bump version to 3.2.1 (#15019) 1 month ago
config Merge branch 'plural-2020.11.18' into main 6 days ago
db Merge branch 'glitch' into main 3 weeks ago
dist Update nginx.conf (#13066) 8 months ago
hooks Add commit hash to displayed version number 4 months ago
lib Merge branch 'glitch' into main 3 weeks ago
log Initial commit 4 years ago
nanobox Resync Nanobox files with the 2.9.0 release (#11083) 1 year ago
public Merge branch 'plural-2020.11.18' into main 6 days ago
spec Remove glitch-soc specific and obsolete /api/v1/mutes/details 1 month ago
streaming Merge branch 'master' into glitch-soc/merge-upstream 1 month ago
vendor Increase files checked by ESLint (#9705) 1 year ago
.buildpacks Remove nodejs buildpack from buildpacks (#14364) 4 months ago
.codeclimate.yml Removed disabling comments for Style/MethodMissingSuper (#15014) 1 month ago
.dockerignore Add .bundle to .dockerignore (#7895) 2 years ago
.editorconfig Add final newline to locale files (#2890) 3 years ago
.env.nanobox Fix sample SAML_ACS_URL, SAML_ISSUER (#12669) 11 months ago
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 4 months ago
.env.test Bump webpacker from 4.0.7 to 4.2.0 (#12416) 1 year ago
.env.vagrant Add a default DB_HOST to .env.vagrant for enable the streaming (#14030) 5 months ago
.eslintignore Increase files checked by ESLint (#9705) 1 year ago
.eslintrc.js Enable promise/catch-or-return allowFinally (#14289) 4 months ago
.foreman Replace sprockets/browserify with Webpack (#2617) 3 years ago
.gitattributes Add .gitattributes file to avoid unwanted CRLF (#3954) 3 years ago
.gitignore Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 4 months ago
.gitmodules Rename themes -> flavours ? ? 3 years ago
.haml-lint.yml Added haml-lint and fix warnings (#2773) 3 years ago
.mailmap Add .mailmap 4 months ago
.nanoignore Remove Storybook (#4397) 3 years ago
.nvmrc Upgrade .nvmrc to Node.js 12 (#12906) 10 months ago
.profile Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276) 3 years ago
.rspec Adding a Mention model, test stubs 4 years ago
.rubocop.yml Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2 months ago
.ruby-version Update .ruby-version (#13395) 7 months ago
.sass-lint.yml Fix sass-lint config (#10982) 1 year ago
.slugignore Remove Storybook (#4397) 3 years ago
.yarnclean Replace from scss-lint to sass-lint (#10958) 1 year ago
AUTHORS.md Update translators (#14374) 4 months ago
Aptfile Stop installing libssl-dev for build (#14660) 3 months ago
CHANGELOG.md Bump version to 3.2.0 (#14395) 4 months ago
CODE_OF_CONDUCT.md Change e-mail contact for CoC enforcement 1 year ago
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 1 year ago
Capfile remove capistrano/faster_assets from Capfile (#2737) 3 years ago
Dockerfile Merge branch 'glitch' into main 2 months ago
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 4 weeks ago
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 4 weeks ago
LICENSE Fix #49 - License changed from GPL-2.0 to AGPL-3.0 4 years ago
Procfile fix: make Procfile compatible with herokuish (#12685) 2 months ago
Procfile.dev Fix Procfile on OS X (#6748) 2 years ago
README.md Revert "[Federation] Dereference object URIs in Create and Update messages" 4 months ago
Rakefile Initial commit 4 years ago
SECURITY.md Add Security Policy (#13946) 5 months ago
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 7 months ago
app.json Stop using heroku-buildpack-nodejs (#14341) 4 months ago
babel.config.js Remove unnecessary dependencies (#12533) 11 months ago
boxfile.yml Correct the Nanobox deploy hooks for order and context (#12663) 11 months ago
config.ru Fix rubocop issues, introduce usage of frozen literal to improve performance 4 years ago
crowdin.yml Update Crowdin configuration file 1 year ago
docker-compose.yml Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348) (#14016) 5 months ago
ide-helper.js Add JS IDE helper (#13012) 7 months ago
package.json Merge branch 'master' into glitch-soc/merge-upstream 4 weeks ago
postcss.config.js Increase files checked by ESLint (#9705) 1 year ago
priv-config TOR federation (#7875) 2 years ago
scalingo.json Remove deprecated config from Heroku and Scalingo (#11925) 1 year ago
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 4 weeks ago

README.md

Mastodon

Build Status Site Status

Mastodon is a free, open-source social network server based on open web protocols like ActivityPub and OStatus. The social focus of the project is a viable decentralized alternative to commercial social media silos that returns the control of the content distribution channels to the people. The technical focus of the project is a good user interface, a clean REST API for 3rd party apps and robust anti-abuse tools.

Ruby on Rails is used for the back-end, while React.js and Redux are used for the dynamic front-end. A static front-end for public resources (profiles and statuses) is also provided.

This repository specifically is for Plural Café and has three branches:

  • main (edge on Docker Hub) for all development and staging work,
  • glitch for all commits from upstream that will automatically be synched to this repository, and
  • production (latest on Docker Hub) for what goes onto the main website.

In addition, there are several repositories in this GitHub organization:

  • pluralcafe/mastodon is this repository and is the codebase for what Plural Café runs,
  • pluralcafe/utils are an assortment of scripts and tutorials to help in Mastodon system administration or general helper files this instance uses,
  • pluralcafe/barkeep is forked from mbilokonsky/ambassador and serves as the Ambassador bot that is run on the instance.

This instance is a fork of a fork: this has the Mastodon Glitch Edition commits. Documentation for Mastodon Glitch Edition can be found here. Anyone wishing to use Glitch Edition in a Docker image for their own site can use the pluralcafe/mastodon:glitch image.


Notable changes from upstream

See output of git log glitch..main --oneline | grep -v '[mM]erge' | less for a (more) complete history.

  • <ol> margin issue fixed so numbered lists aren’t cut off a few pixels shy of 1 number
  • HTML summary/details tags are allowed in toots
  • gemini protocol links are supported (not yet supported: automatically marking gemini:// text as links)
  • authentication required for account api endpoints to block some naive scrapers