mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-25 21:23:42 +01:00
Somewhat experimental and sporadically maintained fork of a fork of a fork of Mastodon
4df3b7cb06
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. |
||
|---|---|---|
| .circleci | ||
| .github | ||
| app | ||
| bin | ||
| config | ||
| db | ||
| dist | ||
| lib | ||
| log | ||
| nanobox | ||
| public | ||
| spec | ||
| streaming | ||
| vendor | ||
| .buildpacks | ||
| .codeclimate.yml | ||
| .dockerignore | ||
| .editorconfig | ||
| .env.nanobox | ||
| .env.production.sample | ||
| .env.test | ||
| .env.vagrant | ||
| .eslintignore | ||
| .eslintrc.js | ||
| .foreman | ||
| .gitattributes | ||
| .gitignore | ||
| .gitmodules | ||
| .haml-lint.yml | ||
| .nanoignore | ||
| .nvmrc | ||
| .profile | ||
| .rspec | ||
| .rubocop.yml | ||
| .ruby-version | ||
| .scss-lint.yml | ||
| .slugignore | ||
| .yarnclean | ||
| app.json | ||
| Aptfile | ||
| AUTHORS.md | ||
| babel.config.js | ||
| boxfile.yml | ||
| Capfile | ||
| CHANGELOG.md | ||
| CODE_OF_CONDUCT.md | ||
| config.ru | ||
| CONTRIBUTING.md | ||
| docker-compose.yml | ||
| Dockerfile | ||
| Gemfile | ||
| Gemfile.lock | ||
| LICENSE | ||
| package.json | ||
| postcss.config.js | ||
| priv-config | ||
| Procfile | ||
| Procfile.dev | ||
| Rakefile | ||
| README.md | ||
| scalingo.json | ||
| Vagrantfile | ||
| yarn.lock | ||
Mastodon Glitch Edition
Now with automated deploys!
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?
- You can view documentation for this project at glitch-soc.github.io/docs/.
- And contributing guidelines are available here and here.