Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,719 Commits 74 Branches 58 Tags
105315a2e331f7e901e3e0685494d6cf678c0ec2
Commit Graph

17 Commits

Author SHA1 Message Date
Claire
105315a2e3 Rename GlitchThemes plugin on import to reduce changes with upstream 2025-07-23 12:10:29 +02:00
Claire
45d79427c4 Merge commit '0af2c4829ff86cf84ed9e7804d023f31e805542b' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Conflict because of differently-named theme plugins.
  Updated to go with upstream's changes.
 2025-07-23 12:08:59 +02:00
Claire
889c0b3a1f Merge commit '9e6a9efe101b36291897ae9fd4dbc5163a6cef38' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream added/updated dependency adjacent to glitch-soc-only dependency.
  Updated as upstream did.
- `vite.config.mts`:
  Upstream reworked the config file while using a different plugin for themes.
  Adapted upstream's changes.
- `yarn.lock`:
  Same as `package.json`
 2025-07-22 23:07:30 +02:00
Echo
0af2c4829f Creates Vite plugin to generate assets file (#35454) 2025-07-22 13:58:04 +00:00
Echo
9e6a9efe10 Replace Ruby Vite plugins (#35195) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-07-17 10:04:04 +00:00
Claire
e2a867507c Merge commit 'e9170e2de1d75e02f04ad39f2af131c70189fb50' into glitch-soc/merge-upstream 2025-07-10 01:10:32 +02:00
Claire
5cfc1fabcf Fix nearly every sub-directory being crawled as part of Vite build (#35323) 2025-07-09 14:34:16 +00:00
Echo
a1e8813522 Emoji Indexing and Search (#35253) 2025-07-09 09:55:41 +00:00
Claire
80af1ea434 Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because of different theming system.
  Adapted upstream's changes.
- `vite.config.mts`:
  Conflict because of different theming system.
  Adapted upstream's changes.
 2025-06-12 20:32:25 +02:00
Echo
825312d4b0 Fix theme name requirement regression with efficient lookup by name (#35007) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-12 14:09:45 +00:00
Claire
086a7016c4 Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream moved its theming system to a plug-in, where we had our own.
  Adapted the file as well as our own plugin to adopt the same mechanisms.
 2025-05-27 20:49:19 +02:00
Claire
0372344d33 Move Mastodon theme handling to custom vite plugin (#34808) 
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
 2025-05-27 08:50:48 +00:00
Claire
706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
 2025-05-25 15:11:58 +02: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
83dd09d4dc Fix JS polyfills missing after the Vite switch (#34758) 2025-05-21 20:11:01 +00:00
Echo
c4f47adb49 Convert from Webpack to Vite (#34450) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-05-16 13:26:12 +00:00
Echo
8c579c5b34 Migrate from Jest to Vitest (#34454) 2025-05-07 18:29:02 +00:00