Florence's fork of Mastodon
Branch: master
Clone or download
Pull request Compare This branch is 2 commits ahead, 51 commits behind tootsuite:master.
Permalink
Type Name Latest commit message Commit time
Failed to load latest commit information.
.circleci Fix CircleCI (tootsuite#9695) Jan 2, 2019
app Only URLs extract with pre-escaped text (tootsuite#9991) Feb 9, 2019
bin Upgrade Babel to version 7.0.0 (tootsuite#5925) Sep 14, 2018
config Rename from instance to server. (tootsuite#9938) Feb 5, 2019
db Add featured hashtags to profiles (tootsuite#9755) Feb 4, 2019
dist Add nginx and systemd templates (tootsuite#8770) Sep 24, 2018
lib Bump version to 2.7.1 (tootsuite#9932) Jan 28, 2019
log Initial commit Feb 20, 2016
nanobox Update Nginx config for Nanobox apps (tootsuite#9310) Nov 20, 2018
public update twemojie to v2 (tootsuite#7911) Jul 5, 2018
spec Only URLs extract with pre-escaped text (tootsuite#9991) Feb 9, 2019
streaming Fix crash when using UNIX socket (tootsuite#9036) Oct 21, 2018
vendor Increase files checked by ESLint (tootsuite#9705) Jan 4, 2019
.buildpacks Add ffmpeg buildpack for scalingo (tootsuite#8500) Aug 28, 2018
.codeclimate.yml Upgrade ESLint to v5.x (tootsuite#9694) Jan 2, 2019
.dockerignore Add .bundle to .dockerignore (tootsuite#7895) Jun 26, 2018
.editorconfig Add final newline to locale files (tootsuite#2890) May 7, 2017
.env.nanobox Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (tootsuite#8423) Aug 25, 2018
.env.production.sample Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (tootsuite#8423) Aug 25, 2018
.env.test Do not test PAM authentication by default (tootsuite#9027) Oct 20, 2018
.env.vagrant update vagrant configs (tootsuite#8706) Sep 16, 2018
.eslintignore Increase files checked by ESLint (tootsuite#9705) Jan 4, 2019
.eslintrc.js Refactor icons in web UI to use Icon component (tootsuite#9951) Jan 31, 2019
.foreman Replace sprockets/browserify with Webpack (tootsuite#2617) May 3, 2017
.gitattributes Add .gitattributes file to avoid unwanted CRLF (tootsuite#3954) Jun 26, 2017
.gitignore Ignore elasticsearch directory (tootsuite#7070) Apr 8, 2018
.haml-lint.yml Added haml-lint and fix warnings (tootsuite#2773) May 8, 2017
.nanoignore Remove Storybook (tootsuite#4397) Jul 27, 2017
.nvmrc Upgrade Node.js to v8.x on nvmrc (tootsuite#8023) Jul 15, 2018
.profile Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (tootsu… May 24, 2017
.rspec Adding a Mention model, test stubs Feb 24, 2016
.rubocop.yml Move more tasks to tootctl (tootsuite#8675) Sep 14, 2018
.ruby-version Upgrade default Ruby version to 2.6.0 (tootsuite#9688) Jan 1, 2019
.scss-lint.yml Enable CodeClimate SCSS Lint checks (tootsuite#2886) May 7, 2017
.slugignore Remove Storybook (tootsuite#4397) Jul 27, 2017
.yarnclean Reduce container size with clean yarn (tootsuite#3506) Sep 30, 2017
AUTHORS.md Add translators to AUTHORS.md (tootsuite#9865) Jan 19, 2019
Aptfile Adjust Aptfile for Heroku-18 stack (tootsuite#8588) Sep 9, 2018
CHANGELOG.md Bump version to 2.7.1 (tootsuite#9932) Jan 28, 2019
CODE_OF_CONDUCT.md Add code of conduct from GitHub generator (tootsuite#5674) Nov 13, 2017
CONTRIBUTING.md Add note that contributors may request reimbursement through OpenColl… Jan 28, 2019
Capfile remove capistrano/faster_assets from Capfile (tootsuite#2737) May 3, 2017
Dockerfile Do not use apk cache and upgrade (tootsuite#9966) Feb 5, 2019
Gemfile Bump microformats from 4.0.7 to 4.1.0 (tootsuite#9980) Feb 6, 2019
Gemfile.lock Bump microformats from 4.0.7 to 4.1.0 (tootsuite#9980) Feb 6, 2019
LICENSE Fix tootsuite#49 - License changed from GPL-2.0 to AGPL-3.0 Sep 21, 2016
Procfile More robust PuSH subscription refreshes (tootsuite#2799) May 5, 2017
Procfile.dev Fix Procfile on OS X (tootsuite#6748) Mar 12, 2018
README.md Update README for Florence Feb 9, 2019
Rakefile Initial commit Feb 20, 2016
Vagrantfile Install both rvm gpg keys in vagrant (tootsuite#9670) Dec 31, 2018
app.json Change logo URL for Heroku and Scalingo (tootsuite#4476) Aug 1, 2017
babel.config.js Upgrade Babel to version 7.0.0 (tootsuite#5925) Sep 14, 2018
boxfile.yml [Nanobox] Enable ElasticSearch support by default (tootsuite#6977) Mar 31, 2018
config.ru Fix rubocop issues, introduce usage of frozen literal to improve perf… Nov 15, 2016
docker-compose.yml Remove uneeded command and switch to images for TOR (tootsuite#9438) Jan 4, 2019
jest.config.js Refactor icons in web UI to use Icon component (tootsuite#9951) Jan 31, 2019
package.json Redesign public hashtag page to use a masonry layout (tootsuite#9822) Jan 16, 2019
postcss.config.js Increase files checked by ESLint (tootsuite#9705) Jan 4, 2019
priv-config TOR federation (tootsuite#7875) Jun 26, 2018
scalingo.json Add ffmpeg buildpack for scalingo (tootsuite#8500) Aug 28, 2018
yarn.lock Redesign public hashtag page to use a masonry layout (tootsuite#9822) Jan 16, 2019

README.md

Florence Mastodon

Mastodon is a free, open-source social network server based on ActivityPub. This is not the official version of Mastodon; this is a separate version (i.e. a fork) maintained by Florence. For more information on Mastodon, you can see the official website and the upstream repo.

This version of Mastodon will include much-wanted changes by the community that are not included in the upstream version of Mastodon. Migrating from the lastest stable release of Mastodon to Florence's Mastodon will always be possible, to ensure that everyone can benefit from these changes.

Versioning

Florence Mastodon will follow semantic versioning. Essentially, this means that versions will be MAJOR.MINOR.PATCH, where:

  • MAJOR version bumps indicate fundamentally incompatible changes. This includes major UI changes, changes to how servers federate, changes that may break existing apps, etc.
  • MINOR version bumps indicate new features that don't break backwards compatibility. While it won't explicitly break anything, users may have to go out of their way to use the new feature, and apps may have to explicitly add support for the feature.
  • PATCH version bumps are for fixes that don't add any new features.

Because Florence Mastodon is currently less than version 1.0.0, there won't be any PATCH versions, and versions will be of the form 0.MAJOR.MINOR. This basically means that breaking changes can happen often.

Release timeline

Florence Mastodon 0.0.0 is mostly equivalent to Mastodon 2.7.1, with some extra changes added in. Right now, the goal pre-1.0 is to incorporate existing, already-developed changes into the fork so that people have a central version to upgrade to.

1.0.0 will be equivalent to some future, stable release of Mastodon, plus these changes. This could be 2.8 or 2.9 or even 2.10; it depends on how fast development happens. Once this is done, work on new features, plus refinement of existing, larger features (such as Glitch.Social's theme changes) can start.

Be sure to check out the issues on the repository for details!

License

Copyright (C) 2016-2019 Florence, Eugen Rochko, and many other Mastodon contributors; see AUTHORS.md.

This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.

You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/.