Mirror of glitch-soc/mastodon@github.com
Go to file
Claire 10a0d76bf0 Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream completely redesigned this, and glitch-soc had different handling for
  the character limit.
  Ported upstream's change to the new version.
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream completely redesigned this, and glitch-soc had different limits for
  option length and number of options.
  Ported glitch-soc's changes to the new version.

Additional change:
- `app/javascript/styles/components.scss`:
  Change how the new image is looked up.
2024-02-22 20:58:41 +01:00
.devcontainer chore(deps): update devdependencies (non-major) (#28840) 2024-01-23 11:44:50 +00:00
.github Fix build-security docker tags 2024-02-01 20:30:35 +01:00
.husky
.yarn
app Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer 2024-02-22 20:58:41 +01:00
bin
chart
config Automatically switch from open to approved registrations in absence of moderators (#29318) 2024-02-22 20:45:40 +01:00
db Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream 2024-01-25 19:51:19 +01:00
dist
lib Bump version to v4.3.0-alpha.3 (#29241) 2024-02-16 12:17:15 +01:00
log
public
spec Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer 2024-02-22 20:58:41 +01:00
streaming Fix logging error in streaming server (#2636) 2024-02-20 20:19:58 +01:00
vendor
.browserslistrc
.buildpacks
.bundler-audit.yml
.dockerignore
.editorconfig
.env.production.sample Add env variable support for number of followable hashtags in feed column (#2500) 2024-02-06 20:23:36 +01:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.js Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer 2024-02-22 20:58:41 +01:00
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.haml-lint_todo.yml
.nanoignore
.nvmrc
.prettierignore
.prettierrc.js
.profile
.rspec
.rubocop.yml
.rubocop_todo.yml Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream 2024-01-27 19:06:41 +01:00
.ruby-gemset
.ruby-version Use ruby version 3.2.3 (#28817) 2024-01-22 11:55:51 +00:00
.simplecov
.slugignore
.watchmanconfig
.yarnrc.yml
AUTHORS.md
Aptfile
CHANGELOG.md Bump version to v4.3.0-alpha.3 (#29241) 2024-02-16 12:17:15 +01:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Dockerfile Use ruby version 3.2.3 (#28817) 2024-01-22 11:55:51 +00:00
FEDERATION.md docs: update FEDERATION.md to more closely follow FEP conventions. (#28838) 2024-01-22 11:11:47 +00:00
Gemfile Update dependency bootsnap to '~> 1.18.0' (#29019) 2024-02-06 20:59:51 +01:00
Gemfile.lock Update dependency haml_lint to v0.57.0 (#29181) 2024-02-22 20:45:40 +01:00
LICENSE
Procfile
Procfile.dev
README.md
Rakefile
SECURITY.md
Vagrantfile
app.json
babel.config.js
config.ru
crowdin-glitch.yml
crowdin.yml
docker-compose.yml Bump version to v4.3.0-alpha.3 (#29241) 2024-02-16 12:17:15 +01:00
ide-helper.js
jest.config.js
jsconfig.json chore(deps): update devdependencies (non-major) (#28840) 2024-01-23 11:44:50 +00:00
lint-staged.config.js
package.json Remove unused dependencies (#29289) 2024-02-22 20:45:40 +01:00
postcss.config.js
priv-config
scalingo.json
stylelint.config.js
tsconfig.json Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 2024-01-24 20:42:53 +01:00
yarn.lock Remove unused dependencies (#29289) 2024-02-22 20:45:40 +01: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?