sd/chuckya-fe-standalone
2
0
Fork 0
Code Pull requests Activity
21,958 commits 2 branches 0 tags 263 MiB
Commit graph

1,941 commits

Author SHA1 Message Date
Essem
aaf54c6395
 		Merge remote-tracking branch 'upstream/main' 2024-03-20 16:41:33 -05:00
Claire
eb3aed9545 Merge commit '50fd94f481' 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
Claire
876aa35350 Merge commit 'ffc5be4820' 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]
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
Essem
32308b6536
 		Merge remote-tracking branch 'upstream/main' 2024-03-09 18:22:55 -06:00
Claire
45e56db8e4 Merge commit 'f89512fbed' 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]
0f7f257139
 		Update Yarn to v4.1.1 (#29508) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-05 09:39:12 +00:00
Essem
54a3fc3ac5
 		Merge remote-tracking branch 'upstream/main' 2024-02-28 22:36:41 -06:00
Claire
21e7a53ca5 Merge commit '3b31447408' 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
Essem
fd6bd9c87b
 		Merge remote-tracking branch 'upstream/main' 2024-02-25 12:15:38 -06:00
Claire
2dc244784c Merge commit 'cfa71a4d16' into glitch-soc/merge-upstream 2024-02-24 15:43:15 +01:00
Claire
7901dc9e24 Merge commit '491dd97642' 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
Matt Jankowski
45f71e3954
 		Update @rails/ujs to version 7.1.3-2 (#29359) 2024-02-22 21:35:14 +00:00
Wojciech Maj
d908ed8e86 Remove unused dependencies (#29289) 2024-02-22 20:45:40 +01:00
Matt Jankowski
006aa4e35a
 		Update husky and remove deprecated features (#29338) 2024-02-22 09:02:15 +00:00
renovate[bot]
c63567a214
 		Update typescript-eslint monorepo to v7 (major) (#29179) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-21 22:06:17 +00:00
Matt Jankowski
581f14e56f
 		Update yarn to version 4.1.0 (#29339) 2024-02-21 21:18:01 +00:00
Wojciech Maj
36fd47ac57
 		Remove unused dependencies (#29289) 2024-02-20 10:10:58 +00:00
Essem
d96fd9f28f
 		Merge remote-tracking branch 'upstream/main' 2024-01-16 13:04:33 -06:00
Claire
2f521bc84a Merge commit 'a2f02a0775' into glitch-soc/merge-upstream 2024-01-15 20:27:41 +01:00
Essem
d84bafcdc0
 		Merge remote-tracking branch 'upstream/main' 2024-01-13 16:28:34 -06:00
Claire
a3b6a85521 Merge commit 'cd37048439' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file.
 2024-01-13 12:11:29 +01:00
Claire
6bbcd9348e
 		Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064) 2024-01-12 20:16:48 +00:00
Renaud Chaput
923fc83190
 		Improve lint-staged config (#28704) 2024-01-12 09:09:57 +00:00
Essem
843725b25b
 		Merge remote-tracking branch 'upstream/main' 2024-01-11 20:51:45 -06:00
Claire
51d2d98174 Merge commit 'a0e237a96f' into glitch-soc/merge-upstream 2024-01-10 18:26:47 +01:00
Claire
0b2c7cdb02 Merge commit 'fe2667bb0d' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
 2024-01-10 17:51:12 +01:00
Renaud Chaput
a0e237a96f
 		Upgrade Redux packages (#28585) 2024-01-08 10:57:40 +00:00
renovate[bot]
da7290839a
 		Update dependency stylelint-config-standard-scss to v13 (#28589) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-04 09:24:43 +00:00
Essem
70cedf5c0e
 		Merge remote-tracking branch 'upstream/main' 2024-01-03 17:21:22 -06:00
Claire
9d9008666b Merge commit '092bb8a27a' into glitch-soc/merge-upstream 2024-01-03 12:38:49 +01:00
renovate[bot]
2b330ede22
 		Update dependency eslint-plugin-jsdoc to v48 (#28564) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-03 09:10:19 +00:00
Essem
36e09fbd6d
 		Merge remote-tracking branch 'upstream/main' 2024-01-02 15:37:44 -06:00
Claire
f685c953e5 Merge commit '3944b12b5e' into glitch-soc/merge-upstream 2024-01-02 18:12:28 +01:00
Matt Jankowski
3944b12b5e
 		Update @typescript-eslint/parser to version 6.17.0 (#28218) 2024-01-02 15:19:54 +00:00
Claire
b3542ac57b Merge commit '1184887b01' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our README.
 2024-01-02 13:35:11 +01:00
renovate[bot]
cd09be054f
 		Update dependency eslint-plugin-jsdoc to v47 (#28541) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-02 10:13:22 +00:00
renovate[bot]
629152a80d
 		Update DefinitelyTyped types (non-major) (#28542) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-02 08:50:45 +00:00
Essem
174f1e7c2c
 		Merge remote-tracking branch 'upstream/main' 2023-12-30 13:56:14 -06:00
Claire
35b6583371 Merge commit '6374358357' into glitch-soc/merge-upstream 2023-12-29 17:40:57 +01:00
Renaud Chaput
fb5eb1f655
 		Replace our custom compression-webpack-plugin patch with the fixed upstream version (#28510) 2023-12-29 09:33:06 +00:00
Essem
8860d937ce
 		Merge remote-tracking branch 'upstream/main' 2023-12-22 16:07:42 -06:00
Claire
f5b7307890 Merge commit 'f99e05710e' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.
 2023-12-21 19:24:10 +01:00
Claire
6e56f95285 Merge commit '4a7395d989' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream modified its README, we have a completely different one.
  Kept our README file.
 2023-12-21 18:17:17 +01:00
Claire
077e0c6812 Merge commit '0b4a3a0437' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system.
 2023-12-20 22:16:50 +01:00
Essem
5fdd18ead1
 		Merge remote-tracking branch 'upstream/main' 2023-12-20 15:01:05 -06:00
Claire
b8209c3b96 Merge commit '85662a5a57' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now.
 2023-12-20 20:10:45 +01:00