tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,139 Commits 5 Branches 0 Tags
8bb924105cb58e7d49a0aa2282ff2a3ab1784ffa
Commit Graph
2026 Commits
Author SHA1 Message Date
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
Renaud Chaput a8f12a6fd8 Change Node.js minimum version to Node 20 (#34390) 2025-05-20 14:25:51 +00:00
renovate[bot] 0d809652d9 chore(deps): update dependency lint-staged to v16 (#34657) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-19 16:10:41 +00:00
renovate[bot]andChaosExAnima 8ab2c4a9fc chore(deps): update dependency stylelint-config-standard-scss to v15 (#34658) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-05-19 12:46:11 +00:00
renovate[bot]andChaosExAnima feb4e0a007 fix(deps): update dependency @react-spring/web to v10 (#34693) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-05-19 12:35:10 +00:00
EchoandRenaud Chaput c4f47adb49 Convert from Webpack to Vite (#34450) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-05-16 13:26:12 +00:00
Claire a5a3a781e0 Merge commit '82688387a8d19906371a6dd4af64e5b662031603' into glitch-soc/merge-upstream 2025-05-09 18:16:46 +02:00
renovate[bot]andRenaud Chaput 23238ddd95 fix(deps): update dependency vite to v6.2.7 [security] (#34640) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-05-09 08:05:58 +00:00
Claire 5cade30257 Merge commit '8c579c5b34b94a9ca59f91d24ec23366f4d21137' into glitch-soc/merge-upstream 
Conflicts:
- `jest.config.js`
- `package.json`
- `tsconfig.json`
 2025-05-08 15:47:40 +02:00
Echo 8c579c5b34 Migrate from Jest to Vitest (#34454) 2025-05-07 18:29:02 +00:00
Claire ff07676aee Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream 2025-05-03 18:03:42 +02:00
Essem e96044f389 Update to Twemoji 15.1.0 (#34321) 2025-04-28 14:22:14 +00:00
Claire b1e3939f91 Remove client-side uploaded image resizing (#3051) 2025-04-21 23:40:17 +02:00
Claire 8cbd99e645 Merge commit 'a324edabdfc19b6978ed31800b92e36022006cd5' into glitch-soc/merge-upstream 2025-04-21 14:32:47 +02:00
renovate[bot] f115c7b3a2 chore(deps): update yarn to v4.9.1 (#34451) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-04-15 09:02:21 +00:00
renovate[bot] abcb9b8a61 chore(deps): update yarn to v4.9.0 (#34410) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-04-14 07:31:44 +00:00
Claire 99e3ea232f Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream 2025-04-04 20:00:24 +02:00
renovate[bot] 470285d815 chore(deps): update yarn to v4.8.1 (#34305) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-04-02 14:43:40 +00:00
Renaud Chaput 0653374c34 Fix Renovate alert with the now deprecated @types/emoji-mart package (#34352) 2025-04-02 12:39:22 +00:00
Renaud Chaput 05fc24c5f9 Fix Typescript dependency resolution (#34351) 2025-04-02 12:38:34 +00:00
Claire e0406fcf02 Merge commit 'e8270e2807727e1cf6a47a40442b3038c5bca858' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved it to `eslint.config.mjs`.
  Ported the glitch-soc changes there.
- `yarn.lock`:
  Upstream updated dependencies close to glitch-soc-only dependencies.
  Ported upstream's changes.
 2025-04-01 20:59:34 +02:00
EchoandNick Schonning e8270e2807 Upgrade to ESLint v9 flat config (#34324) 
Co-authored-by: Nick Schonning <nschonni@gmail.com>
 2025-04-01 16:30:18 +00:00
Claire 8efc381063 Merge commit '04a9252a93fe18aa514957765a35e0abe2596864' into glitch-soc/merge-upstream 2025-03-29 19:19:58 +01:00
Claire f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
Echo 74ee96505a Upgrade Intl packages (#34306) 2025-03-28 17:30:02 +00:00
Echo 902aab1245 Remove react-motion library (#34293) 2025-03-28 12:34:51 +00:00
Claire 4ace929129 Merge commit '94d71c992e0fd88fc3a3fc92b598f139c874ab3f' into glitch-soc/merge-upstream 2025-03-25 21:12:37 +01:00
Eugen Rochko 94d71c992e Refactor alerts to TypeScript, remove react-notification dependency (#34239) 2025-03-25 18:25:07 +00:00
Claire e7498887a7 Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Upstream removed some code that somehow had been modified in glitch-soc.
  Removed it as upstream did.
 2025-03-24 20:06:25 +01:00
Eugen RochkoandChaosExAnima 2e9b2df570 Add double tap to zoom and swipe to dismiss to media modal in web UI (#34210) 
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-03-24 17:25:30 +00:00
Claire 4bea9a0a66 Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream 2025-03-07 18:34:27 +01:00
renovate[bot]andRenaud Chaput d2ce9a6064 chore(deps): update eslint (non-major) (#33061) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-03-06 13:55:44 +00:00
renovate[bot] 64719aa4ee chore(deps): update yarn to v4.7.0 (#34047) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-06 10:52:12 +00:00
Damien Erambert debe6c0545 Add emoji from Twemoji 15.0 to the emoji picker/completion (#33395) 2025-03-05 17:05:15 +00:00
Claire 05e5db91c7 Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict because one of the removed lines was modified to accomodate for
  glitch-soc's slightly different build system.
  Removed the lines as upstream did.
 2025-01-21 19:23:25 +01:00
Eugen Rochko 11786f1114 Change design of edit media modal in web UI (#33516) 2025-01-21 11:34:22 +00:00
Claire 08e7c4f3a7 Merge commit '7f866daf637e9303c7b503e0ed29ef8802fcb4c0' into glitch-soc/merge-upstream 2025-01-20 18:06:13 +01:00
Eugen Rochko 8962f11578 Add warning when selected and detected language is different in web UI (#33042) 2025-01-20 09:17:13 +00:00
Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
 2025-01-10 20:41:36 +01:00
renovate[bot] 51a92427ce Update dependency react-intl to v7 (#32954) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-09 10:04:14 +00:00
renovate[bot]andRenaud Chaput 8233293429 Update DefinitelyTyped types (non-major) (#33220) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-01-07 09:28:06 +00:00
Claire cef665788a Merge commit '8e3fd1b8236448f01221b1d7745736e50de51e11' into glitch-soc/merge-upstream 2025-01-02 21:14:14 +01:00
renovate[bot] ca06156087 Update Yarn to v4.6.0 (#33417) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-02 09:07:45 +00:00
Claire 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 2024-12-25 18:01:37 +01:00
Matt Jankowski a8edc82471 Replace deprecated "github" format for stylelint on CI runs (#33292) 2024-12-14 09:50:08 +00:00
renovate[bot] 5e4ca0881e Update dependency @rails/ujs to v7.1.501 (#33258) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-11 07:55:14 +00:00
renovate[bot] d58173e45b Update dependency @dnd-kit/sortable to v10 (#33183) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-05 09:12:21 +00:00
renovate[bot] 30c2a6c01c Update dependency @rails/ujs to v7.1.500 (#32648) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-03 15:53:36 +00:00
Claire 48827e1210 Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream 
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `spec/helpers/application_helper_spec.rb`:
  Minor conflict due to glitch-soc's theming system.
 2024-12-01 17:36:49 +01:00