Commit Graph

7 Commits

Author SHA1 Message Date
Claire
d7d102e68f Merge commit 'e24737c612730fd865f62905484dbfa25b82d27e' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream removed it, replaced by `.oxfmtrc.json`.
  We had glitch-specific files in there.
  Updated `.oxfmtrc.json` accordingly and removed `.prettierignore`.
- `config/formatjs-formatter.js`:
  Upstream switched to `oxfmt` from `prettier`, and some rules are slightly different.
  Glitch-soc had extra code in there.
  Reformatted appropriately.
- `eslint.config.mjs`:
  Upstream moved some configuration from `eslint.config.mjs` to `.oxfmtrc.json` where
  glitch-soc had slightly different configuration.
  Removed it from `eslint.config.mjs` as well and updated `.oxfmtrc.json` accordingly.
- `package.json`:
  Upstream changed script definitions textually adjacent to one that we have modified.
  Applied upstream's change, keeping the textually adjacent modified script intact.
2026-02-20 20:32:58 +01:00
Renaud Chaput
5b75667c03 [Glitch] Update to latest eslint-plugin-react-hooks
Port 9addad8ce5 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-11-10 22:29:58 +01:00
diondiondion
cda2119af8 [Glitch] Add first-time user education hint about quote removal on Quote notifications
Port e7c30cd072 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-09-05 20:32:33 +02:00
Claire
26ee915d0b [Glitch] Fix “Alt text” button submitting form in moderation interface
Port 9954acf61d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-24 22:48:07 +02:00
Claire
079fa6bade [Glitch] Move app/javascript/hooks to app/javascript/flavours/glitch/hooks
Port b57687083f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-03-07 17:45:57 +01:00
Eugen Rochko
800bea7209 [Glitch] Add ability to dismiss alt text badge by tapping it in web UI
Port 796187c1e8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-02-01 19:10:32 +01:00
Eugen Rochko
9e10fd59b7 [Glitch] Add ability to view alt text by clicking the ALT badge in web UI
Port a04433f995 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-29 13:35:35 +02:00