Commit Graph

5 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
Renaud Chaput
aa8ad92fa4 [Glitch] Remove the title attribute when hovering a card anchor
Port 981395e4d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-08 19:48:01 +02:00
Eugen Rochko
dcfd39991b [Glitch] Change hover cards to not appear until the mouse stops in web UI
Port b728c0e8ce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-01 20:50:26 +02:00
Eugen Rochko
98185247b8 [Glitch] Add hover cards in web UI
Port e89317d4c1

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-06-30 18:41:48 +02:00