The Fediverse server that meows at you - a fork of glitch-soc Mastodon
Find a file
neatchee 2343a1f452 Merge remote-tracking branch 'glitch-soc/main' into merge/glitch/20240213
Conflicts resolved:
	app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
	app/javascript/flavours/glitch/styles/components/accounts.scss
	app/javascript/flavours/glitch/styles/components/announcements.scss
	app/javascript/flavours/glitch/styles/components/columns.scss
	app/javascript/flavours/glitch/styles/components/status.scss
	app/serializers/initial_state_serializer.rb
2024-02-13 23:29:54 -08: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-08 20:58:31 -08:00
.husky
.yarn Replace our custom compression-webpack-plugin patch with the fixed upstream version (#28510) 2023-12-29 09:33:06 +00:00
app Merge remote-tracking branch 'glitch-soc/main' into merge/glitch/20240213 2024-02-13 23:29:54 -08:00
bin Use bundler version 2.5.4 (#28765) 2024-01-17 14:35:55 +00:00
chart
config Merge remote-tracking branch 'glitch-soc/main' into merge/glitch/20240213 2024-02-13 23:29:54 -08:00
db Fix rubocop complaint 2024-02-08 21:05:39 -08:00
dist Add suggestion for secure cyphers to nginx.conf (#26349) 2023-08-31 12:17:10 +02:00
lib Merge pull request from GHSA-3fjr-858r-92rw 2024-02-08 20:58:31 -08:00
log
public Merge branch 'merge/intermediate/20240126' 2024-01-26 19:05:02 -08:00
spec Merge remote-tracking branch 'glitch-soc/main' into merge/glitch/20240213 2024-02-13 23:29:54 -08:00
streaming Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 2024-01-24 20:42:53 +01:00
vendor
.browserslistrc
.buildpacks
.bundler-audit.yml Ignore the devise-two-factor advisory as we have rate limits in place (#28733) 2024-01-15 10:45:48 +00:00
.dockerignore Do not copy public/packs-test into Docker (#27736) 2023-11-07 09:22:04 +00:00
.editorconfig
.env.production.sample Add support for emoji reactions 2024-02-08 21:05:39 -08:00
.env.test Improve Babel configuration and automatically load polyfills (#27333) 2023-10-31 10:55:13 +00:00
.env.vagrant Add elastic search installation into Vagrantfile (#26512) 2023-08-23 15:46:14 +02:00
.eslintignore
.eslintrc.js Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream 2024-01-10 18:26:47 +01:00
.foreman
.gitattributes
.gitignore Merge remote-tracking branch 'glitch-soc/main' into merge/glitch/20231226 2023-12-26 23:26:55 -08:00
.gitmodules
.haml-lint.yml Update haml-lint line length configuration to match rubocop value (#27570) 2023-10-31 09:47:16 +00:00
.haml-lint_todo.yml Fix LineLength haml-lint in media/player view (#28667) 2024-01-10 09:35:01 +00:00
.nanoignore
.nvmrc Update dependency node to 20.11 (#28670) 2024-01-11 12:48:01 +00:00
.prettierignore Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream 2024-01-13 12:11:29 +01:00
.prettierrc.js Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
.profile
.rspec
.rubocop.yml Merge branch 'merge/intermediate/20240126' 2024-01-26 19:05:02 -08:00
.rubocop_todo.yml Merge commit 'a4e7cc2d9498f15ca7f6f76d9346929cb73e7a33' 2024-02-04 18:11:19 -08:00
.ruby-gemset
.ruby-version Use ruby version 3.2.3 (#28817) 2024-01-22 11:55:51 +00:00
.simplecov Disable simplecov enable_coverage_for_eval option, move to standalone file (#27869) 2023-11-15 23:09:31 +00:00
.slugignore
.stylelintignore Import new skins/styles from Sakurajima repo 2023-07-24 18:52:58 -07:00
.watchmanconfig Fix Jest config (#27834) 2023-11-13 12:19:41 +00:00
.yarnrc.yml Upgrade to Yarn 4, remove support for Node 16 (#27073) 2023-11-08 10:57:21 +00:00
app.json
Aptfile
AUTHORS.md Update AUTHORS.md (#27018) 2023-09-21 14:42:15 +02:00
babel.config.js Disable Babel polyfill injection in dev (#27691) 2023-11-06 10:24:41 +00:00
CHANGELOG.md Prune the changelog of older entries (#27432) 2023-10-23 14:35:56 +02:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream 2023-12-21 18:17:17 +01:00
crowdin-glitch.yml Fix Crowdin Github Action (#2311) 2023-07-19 08:36:25 +02:00
crowdin.yml Add a Github Action to send translations to Crowdin for each merge in main (#25869) 2023-07-18 16:56:01 +02:00
docker-compose.yml Change startup command for Puma in Docker Compose (#28138) 2023-12-01 11:06:37 +00:00
Dockerfile Use ruby version 3.2.3 (#28817) 2024-01-22 11:55:51 +00:00
domain_blocks.csv Update domain_blocks.csv 2023-09-22 10:25:36 -07: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-08 20:58:31 -08:00
Gemfile.lock Update dependency sidekiq-unique-jobs to v7.1.33 (#29175) 2024-02-13 20:03:00 +01:00
ide-helper.js
jest.config.js Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 2024-01-15 20:06:31 +01:00
jsconfig.json chore(deps): update devdependencies (non-major) (#28840) 2024-01-23 11:44:50 +00:00
LICENSE
lint-staged.config.js Improve lint-staged config (#28704) 2024-01-12 09:09:57 +00:00
package.json Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream 2024-01-15 20:27:41 +01:00
postcss.config.js
priv-config
Procfile
Procfile.dev Split streaming server from web server (#24702) 2023-11-14 17:43:20 +00:00
Rakefile Run Rubocop on Rakefile (#23871) 2023-07-12 09:47:54 +02:00
README.md Update copyright year to 2024 (#28550) 2024-01-01 19:08:01 +00:00
scalingo.json
SECURITY.md Remove v3.5 branch from supported Mastodon versions (#28574) 2024-01-03 15:04:10 +00:00
stylelint.config.js
tsconfig.json Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 2024-01-24 20:42:53 +01:00
Vagrantfile Change Vagrant to install Node 20 (#28100) 2023-11-30 10:46:06 +00:00
yarn.lock Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00

Mastodon Glitch+Urusai Edition

This is the repo for the fork of Mastodon used by Urusai! Social.

Added features:

  • Flavours/styles from @chikorita157@sakurajima.moe
  • Emoji enhancements
    • Enlarge emoji in post content on mouse-over/tap
  • Collapsed post improvements
    • show > 1 line for better visual parsing
    • customize height of posts to trigger lengthy toot collapse, etc)
  • Option to merge boosts and favorites into a single notification for the same status
  • Emoji reactions!
  • Other minor fixes/improvements

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?