fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-26 23:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
Your self-hosted, globally interconnected microblogging community
15723 commits 130 branches 266 tags 979 MiB
Ruby 63.8%
JavaScript 19%
TypeScript 7.5%
SCSS 4.8%
Haml 4.4%
Other 0.5%
Go to file
Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
2022-08-28 11:31:00 +02:00
.circleci Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
.devcontainer Disable transpile to older iOS versions (#18462) 2022-05-20 04:39:05 +02:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
app Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
bin
chart Mark job pods not to use Istio's envoy sidecar (#18415) 2022-08-25 04:40:38 +02:00
config Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
db Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
dist Also compress SVG and ICO images in nginx (#17651) 2022-02-26 17:27:11 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
log
public Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
vendor
.browserslistrc Add ES6 compatibility to browserslist (#18519) 2022-05-26 20:29:28 +02:00
.buildpacks
.codeclimate.yml Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02:00
.deepsource.toml
.dockerignore Update .dockerignore/.gitignore for #16947 etc (#17099) 2021-12-06 18:04:04 +01:00
.editorconfig
.env.production.sample Change default values for emoji limits in .env.production.sample and comment them out 2022-07-17 22:58:41 +02:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.js Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02:00
.foreman
.gitattributes
.gitignore Update .dockerignore/.gitignore for #16947 etc (#17099) 2021-12-06 18:04:04 +01:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc NodeJS 14 support - circleci/docker/.nvmrc (#16163) 2021-08-10 22:56:13 +02:00
.prettierignore Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
.prettierrc.js Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
.profile
.rspec
.rubocop.yml Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
.ruby-gemset Make Mastodon use its own gemset (#17858) 2022-08-13 15:44:34 +02:00
.ruby-version Bump Ruby version from 3.0.3 to 3.0.4 (#18028) 2022-08-15 04:39:58 +02:00
.slugignore
.yarnclean
app.json Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
Aptfile Remove protobuf dependencies (#17539) 2022-02-14 16:08:02 +01:00
AUTHORS.md Bump version to 3.5.0rc1 (#17618) 2022-03-15 08:16:45 +01:00
babel.config.js Remove dependency for @babel/plugin-proposal-class-properties (#16155) 2021-05-04 23:13:04 +02:00
Capfile
CHANGELOG.md Bump version to 3.5.3 (#18530) 2022-05-26 23:26:15 +02:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
crowdin.yml Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085) 2021-12-01 19:03:35 +01:00
docker-compose.yml Update docker-compose.yml (#19063) 2022-08-27 17:40:46 +02:00
Dockerfile Bump Ruby version from 3.0.3 to 3.0.4 (#18028) 2022-08-15 04:39:58 +02:00
FEDERATION.md Add FEDERATION.md (#17029) 2021-11-23 00:15:31 +01:00
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2022-08-21 14:39:25 +02:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
ide-helper.js
jest.config.js Merge branch 'main' into glitch-soc/merge-upstream 2022-05-04 19:15:50 +02:00
LICENSE
package.json Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md Drop support for Ruby v2.5 and Node.js v12 (#18323) 2022-06-16 22:09:58 +02:00
scalingo.json Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
SECURITY.md Remove 3.3.x from supported versions in security policy (#18516) 2022-05-26 18:43:14 +02:00
stylelint.config.js Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?