Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,388 Commits 74 Branches 58 Tags
eea86088cf6112f1a5f064913b0c26c05c886196
Commit Graph

2074 Commits

Author SHA1 Message Date
Claire
8fad4926c5 Merge commit '1571514e49ec02a57c050612b3bca856f54933fb' into glitch-soc/merge-upstream 2025-09-27 21:29:19 +02:00
Claire
4053209a05 Merge commit '6d2493ca7c39a5d60edd7109de0c24256f8fff8c' into glitch-soc/merge-upstream 2025-09-25 18:44:23 +02:00
diondiondion
d801cf8e59 Replace react-router-scroll-4 with inlined implementation (#36253) 2025-09-25 12:26:50 +00:00
renovate[bot]
85213dab47 chore(deps): update yarn to v4.10.3 (#36178) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-25 07:56:33 +00:00
renovate[bot]
cc54b33720 chore(deps): update dependency typescript to ~5.9.0 (#36212) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-09-25 07:52:37 +00:00
Claire
a548c5c29b Merge commit '24ddf80ff7a707bcea01a6e59831ffefe495f3e0' into glitch-soc/merge-upstream 2025-09-23 18:41:09 +02:00
Renaud Chaput
6689040fc6 Renovate config improvements (#36209) 2025-09-22 09:08:35 +00:00
Claire
03e07d88d7 Merge commit 'd880f397dfbe95bb8c3c9ed5730fbba76398df5f' into glitch-soc/merge-upstream 2025-08-28 20:23:39 +02:00
renovate[bot]
3ab2d14782 Update Yarn to v4.9.4 (#35837) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-28 12:39:01 +00:00
Claire
4d9150735a Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
  Updated the dependency as upstream did.
 2025-08-17 20:52:34 +02:00
renovate[bot]
2112416761 Update dependency @rails/ujs to v7.1.502 (#35772) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-14 07:34:30 +00:00
renovate[bot]
613cbf720c Update dependency eslint-plugin-jsdoc to v54 (#35760) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-13 07:28:21 +00:00
renovate[bot]
5847117573 Update dependency eslint-plugin-jsdoc to v53 (#35742) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 13:54:22 +00:00
Renaud Chaput
379f12ea00 Update to Vite 7 (#35598) 2025-08-11 12:35:36 +00:00
Claire
53185f5381 Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream 2025-08-04 21:24:47 +02:00
Echo
28b0e5ee78 Provides legacy fallback for browser that don't support regex flag v (#35659) 2025-08-04 17:15:46 +00:00
renovate[bot]
49dcbd22d6 Update eslint (non-major) (#35661) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-04 14:19:48 +00:00
Claire
dbab707d64 Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream 2025-08-01 22:11:59 +02:00
Echo
6bca52453a Emoji Rendering Efficiency (#35568) 2025-07-31 17:30:14 +00:00
Claire
e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.
 2025-07-30 20:05:45 +02:00
renovate[bot]
25add0af31 Update dependency cross-env to v10 (#35564) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-30 12:15:56 +00:00
renovate[bot]
027657b590 Update dependency eslint-plugin-jsdoc to v52 (#35561) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-30 12:14:33 +00:00
Claire
63af7ecb1f Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream 2025-07-23 18:43:56 +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
760d00b7f7 Emoji Rendering (#35424) 2025-07-22 14:43:15 +00:00
renovate[bot]
ae13063460 chore(deps): update dependency eslint-plugin-jsdoc to v51 (#35026) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-21 16:31:10 +00:00
renovate[bot]
bf17895d19 chore(deps): update dependency chromatic to v13 (#35064) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-21 16:28:01 +00:00
Matt Jankowski
20b3c43dde Update playwright-ruby-client to version 1.54.0 (#35448) 2025-07-21 16:24:55 +00:00
diondiondion
4de5cbd6f5 refactor: Replace react-hotkeys with custom hook (#35425) 2025-07-21 14:43:38 +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
Echo
a1e8813522 Emoji Indexing and Search (#35253) 2025-07-09 09:55:41 +00:00
Claire
3efc857fbc Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream 2025-07-08 16:41:01 +02:00
Echo
52bc2f64f4 Import Emojibase data (#35229) 2025-07-02 08:58:39 +00:00
Claire
93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream 
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.
 2025-06-24 22:43:43 +02:00
Echo
8ee8231a43 Adds Redux and React-Intl to storybook (#35094) 2025-06-24 09:31:27 +00:00
Claire
ac68d7e471 Merge commit 'b10fde673d4e703b53f43691419a6e91672daf9e' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  Upstream added config for storybook files, while glitch-soc had an addition
  for the glitch flavor on the last line.
  Added upstream's new config.
- `yarn.lock`:
  Upstream added a new dependency to an `eslint` plugin textually adjacent to
  a couple glitch-only-dependencies.
  Added upstream's new dependency.
 2025-06-06 13:32:20 +02:00
diondiondion
f2cfa4f482 feat: Add Storybook for component documentation, testing, and development (#34907) 
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-06-06 09:27:29 +00:00
Claire
2085b0b53a Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
  Not a real conflict, just glitch-soc code textually adjacent to code added
  upstream.
 2025-06-05 18:02:40 +02:00
renovate[bot]
09208eafa4 chore(deps): update yarn to v4.9.2 (#34916) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-05 13:37:43 +00:00
Claire
e8f713ba57 Merge commit '47512fe51867fd30f13e02731a9733fa971e8837' into glitch-soc/merge-upstream 2025-05-26 18:46:50 +02:00
renovate[bot]
47512fe518 fix(deps): update dependency rollup-plugin-visualizer to v6 (#34805) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-26 13:26:09 +00:00
Claire
342290a9e0 Merge commit '198b59ca3ec45cbf6e73f53e1f39c7204d8a70c9' into glitch-soc/merge-upstream 2025-05-26 12:31:26 +02:00
Claire
b3615a803e Remove unnecessary direct dependency to glob (#34809) 2025-05-26 07:42:24 +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
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +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
Echo
84d03e4e16 Revert React Spring to 9.7.5 and updates Renovate (#34788) 2025-05-23 12:34:41 +00:00
Renaud Chaput
83dd09d4dc Fix JS polyfills missing after the Vite switch (#34758) 2025-05-21 20:11:01 +00:00