5 Commits

Author SHA1 Message Date
Claire
0dddc44eb5 [Glitch] Add fallback to Object intent for FEP-3b86 in remote interaction helper
Port 9916c786e67080e71b6f8fc36d11f5d8daa233d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2026-03-11 18:53:10 +01:00
Eugen Rochko
4150cee7a5 [Glitch] Add support for FEP-3b86 (Activity Intents)
Port 69b1f60f4e46cf58e7240c2bfb81588accc1af6f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2026-03-10 18:12:54 +01:00
Claire
f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
Too many conflicts to list, because of webpack → vite migration.
2025-05-25 14:36:51 +02:00
Renaud Chaput
2e3d6e451f [Glitch] Enable stricter Typescript options
Port 3750e8050cb4a5707e76dfb8f49687cc0984f67f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-05-29 17:09:35 +02:00
Claire
bceb45adda Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/entrypoints/common.js`:
  Upstream moved everything from `app/javascript/packs` to
  `app/javascript/entrypoints` while this file was a glitch-soc
  addition. Moved it like the rest.
- `tsconfig.json`:
  Conflict due to glitch-soc's flavor.
  Updated like upstream.

Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
2024-05-04 14:59:00 +02:00