mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,293 Commits
67 Branches
15 Tags
370 MiB
Commit Graph

2430 Commits (113c931cdafd06147fe443b5b94c802710e519f0)

Author SHA1 Message Date
Claire 0e76b919b5 Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream 2024-04-06 21:48:35 +02:00
Claire 903dc53522 Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream 2024-04-06 20:01:25 +02:00
Claire 67842ffb22 Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream 2024-04-06 19:54:11 +02:00
Claire f2b23aa5f3 Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes.
 2024-04-06 19:35:21 +02:00
renovate[bot] 766c1fea20
Update devDependencies (non-major) (#29746) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-25 12:14:46 +00:00
renovate[bot] 55e2c827bd
Update DefinitelyTyped types (non-major) (#29743) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-25 11:09:05 +00:00
renovate[bot] 45f8364cd1
Update dependency typescript to v5.4.3 (#29744) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-25 11:09:00 +00:00
renovate[bot] bbf36836b6
Update formatjs monorepo (#29733) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-25 11:07:47 +00:00
renovate[bot] 1df00d4e76
Update dependency pino-pretty to v11 (#29662) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-21 10:46:14 +00:00
renovate[bot] a506b09de0
Update dependency @reduxjs/toolkit to v2.2.2 (#29681) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-21 10:41:47 +00:00
renovate[bot] 1feb228275
Update dependency express to v4.19.1 (#29663) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-21 10:40:38 +00:00
renovate[bot] 01464074c9
Update dependency autoprefixer to v10.4.19 (#29682) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-21 08:32:31 +00:00
renovate[bot] 3f363c61bc
Update dependency postcss to v8.4.38 (#29684) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-21 08:32:25 +00:00
renovate[bot] 99c9db5f67
Update babel monorepo to v7.24.3 (#29660) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-20 15:48:24 +00:00
renovate[bot] 27a6fa7b0e
Update dependency cssnano to v6.1.1 (#29661) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-20 15:44:36 +00:00
Claire eb3aed9545 Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream touched a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2024-03-20 12:27:52 +01:00
Claire a68dd889fe
Add back support for old browsers (#29654) 2024-03-20 11:07:10 +00:00
renovate[bot] 5f1380415f
Update dependency postcss to v8.4.37 (#29656) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-20 08:19:08 +00:00
Claire 876aa35350 Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2024-03-19 19:21:12 +01:00
renovate[bot] 42cdd0c095
Update babel monorepo to v7.24.1 (#29645) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-19 13:00:39 +00:00
renovate[bot] caee5e4d6a
Update dependency core-js to v3.36.1 (#29642) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-19 09:11:38 +00:00
renovate[bot] 58ce0002cd
Update dependency typescript to v5.4.2 (#29632) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 10:00:29 +00:00
renovate[bot] 7f17162242
Update dependency cssnano to v6.1.0 (#29514) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 10:00:13 +00:00
renovate[bot] 0dd1c772a8
Update dependency cocoon-js-vanilla to v1.5.1 (#29461) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 09:59:45 +00:00
renovate[bot] 6ebb971aad
Update dependency async-mutex to ^0.5.0 (#29552) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 09:59:31 +00:00
Claire 9142805ca8
Remove deprecated `@types/…` packages (#29633) 2024-03-18 09:58:28 +00:00
renovate[bot] 1164c7005e
Update dependency http-link-header to v1.1.3 (#29625) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 09:33:54 +00:00
renovate[bot] 307efe41c6
Update dependency axios to v1.6.8 (#29613) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 09:15:03 +00:00
renovate[bot] a0fcac9652
Update dependency postcss to v8.4.36 (#29628) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 08:49:34 +00:00
renovate[bot] 5d3d525d0e
Update DefinitelyTyped types (non-major) (#29631) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 08:48:13 +00:00
Claire 2c622497c2 Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream 2024-03-15 18:48:39 +01:00
renovate[bot] 52200b6bbf
Update dependency sass to v1.72.0 (#29586) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-15 11:41:55 +00:00
Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.
 2024-03-11 17:29:07 +01:00
renovate[bot] 6984f94044
Update dependency autoprefixer to v10.4.18 (#29475) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-11 09:05:07 +00:00
renovate[bot] 7b89d6842e
Update DefinitelyTyped types (non-major) (#29543) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-11 08:49:07 +00:00
renovate[bot] df3798a6fa
Update dependency eslint-plugin-jsdoc to v48.2.1 (#29544) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-11 08:49:04 +00:00
Claire 45e56db8e4 Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our version.
 2024-03-05 16:25:50 +01:00
renovate[bot] 4c138ee4eb
Update DefinitelyTyped types (non-major) (#29502) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-05 09:42:26 +00:00
renovate[bot] cb0f3ecc28
Update eslint (non-major) (#29505) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-05 09:41:31 +00:00
renovate[bot] 68600893d2
Update babel monorepo to v7.24.0 (#29434) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-02 18:33:33 +00:00
Claire 4d7e7cc562 Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream 2024-02-29 18:24:47 +01:00
renovate[bot] 6dfe318f34
Update dependency express to v4.18.3 (#29458) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-29 15:20:39 +00:00
Claire 21e7a53ca5 Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one
  were changed, but otherwise no real conflict.
  Ported upstream's changes and kept glitch-soc's `i18n:extract`.
- `tsconfig.json`:
  Upstream's dependencies changed the code style rules for json formatting, and
  we had local changes.
  Kept our changes, but with upstream's formatting/
- `yarn.lock`:
  A dependency textually adjacent to a glitch-soc-only one got changed.
  Applied upstream's change, keeping the glitch-soc-only dependency.
 2024-02-28 20:27:28 +01:00
Renaud Chaput 3b31447408
Rework Prettier invocation (#28851) 2024-02-27 16:09:27 +00:00
renovate[bot] dc4427dc9b
Update devDependencies (non-major) (#29089) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-02-27 16:07:43 +00:00
Claire 67ca8bb56a Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Change applied to `app/javascript/core/admin.js` instead.
 2024-02-26 17:43:16 +01:00
renovate[bot] b829d261ba
Update DefinitelyTyped types (non-major) (#29404) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-26 12:52:03 +00:00
renovate[bot] 8fd8b30c24
Update dependency cssnano to v6.0.5 (#29385) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-26 12:41:34 +00:00
Claire 2dc244784c Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream 2024-02-24 15:43:15 +01:00
Claire 7901dc9e24 Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream 
Conflicts:
- `app/workers/scheduler/auto_close_registrations_scheduler.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
 2024-02-24 15:33:36 +01:00