mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 05:23:14 -08:00
Code Issues Projects Releases Packages Wiki Activity
23,312 commits 2 branches 0 tags 263 MiB
Commit graph

1,998 commits

Author SHA1 Message Date
Kopper
911833f860 Merge branch 'main' into standalone 2024-08-04 09:03:46 +03:00
Essem
845f95bc5d
 		Merge remote-tracking branch 'upstream/main' 2024-08-03 18:36:56 -05:00
Claire
e67e07211f Merge commit 'ad95c98054' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
 2024-08-02 18:09:48 +02:00
Renaud Chaput
99c446b7cf
 		Change PostCSS config to allow logical properties (#31264) 2024-08-02 13:17:36 +00:00
Essem
2637a8cd05
 		Merge remote-tracking branch 'upstream/main' 2024-07-29 23:46:21 -05:00
Claire
654187a995 Merge commit '1229d2907a' into glitch-soc/merge-upstream 2024-07-29 19:16:58 +02:00
renovate[bot]
90d6297191
 		chore(deps): update eslint (non-major) (#31188) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-29 08:06:12 +00:00
Essem
2f50bcafc8
 		Merge remote-tracking branch 'upstream/main' 2024-07-24 23:04:49 -05:00
Claire
d999fc52ba Merge commit '06f070d86d' into glitch-soc/merge-upstream 2024-07-24 20:07:37 +02:00
renovate[bot]
06f070d86d
 		fix(deps): update dependency fuzzysort to v3 (#30315) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-07-24 08:13:09 +00:00
Claire
68000956f4 Merge commit 'cd0ca4b994' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Nick Schonning
9a015a2a15
 		Update Prettier to 3.3.3 (#31106) 2024-07-23 06:46:09 +00:00
Essem
63f5f98eb8
 		Merge remote-tracking branch 'upstream/main' 2024-07-18 16:21:00 -05:00
Claire
c75fe09e2b Merge commit '82344342c1' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00
Renaud Chaput
f587ff643f
 		Grouped Notifications UI (#30440) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-18 14:36:09 +00:00
Kopper
29f89db19d Merge remote-tracking branch 'upstream/main' into standalone 2024-07-15 20:18:54 +03:00
Essem
6450fb0cf5
 		Merge remote-tracking branch 'upstream/main' 2024-07-04 10:31:27 -05:00
Claire
70ff7a7c69 Merge commit '9be77fc0db' into glitch-soc/merge-upstream 2024-07-03 22:10:41 +02:00
renovate[bot]
f99159d1eb
 		fix(deps): update dependency webpack-merge to v6 (#30891) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-03 08:46:51 +00:00
Claire
d270165be3 Merge commit 'aeefe5b2be' into glitch-soc/merge-upstream 2024-07-01 12:05:39 +02:00
renovate[bot]
aeefe5b2be
 		chore(deps): update eslint (non-major) (#30883) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-01 09:03:38 +00:00
Essem
8a01720cb2
 		Merge remote-tracking branch 'upstream/main' 2024-06-30 15:41:10 -05:00
Claire
d2aea85e6c Merge commit '5d4dbbcc67' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
renovate[bot]
1bccba1408
 		chore(deps): update dependency @testing-library/react to v16 (#30533) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-06-28 11:39:32 +00:00
Essem
771014fc90
 		Merge remote-tracking branch 'upstream/main' 2024-06-24 14:01:26 -05:00
Claire
3b4607991d Merge commit '4743657ba2' into glitch-soc/merge-upstream 2024-06-22 20:59:23 +02:00
renovate[bot]
4e6db5e284
 		chore(deps): update yarn to v4.3.1 (#30790) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-21 11:38:26 +00:00
Essem
167a30b2bf
 		Merge remote-tracking branch 'upstream/main' 2024-06-19 21:43:32 -05:00
Claire
677f73f793 Merge commit '3a191b3797' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
renovate[bot]
54ab70dfcf
 		chore(deps): update yarn to v4.3.0 (#30644) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-12 12:42:04 +00:00
Essem
fad5adbfe6
 		Merge remote-tracking branch 'upstream/main' 2024-05-30 09:32:49 -05:00
Claire
c827a98f19 Merge commit 'd20a5c3ec9' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
 2024-05-29 17:03:24 +02:00
renovate[bot]
ed99923138
 		chore(deps): update eslint (non-major) (#30444) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-27 09:57:19 +00:00
Essem
9b0c46ebf2
 		Merge remote-tracking branch 'upstream/main' 2024-05-20 21:35:02 -05:00
Claire
e46321e63d Merge commit 'de4815afda' into glitch-soc/merge-upstream 2024-05-20 12:17:36 +02:00
renovate[bot]
0ce22859a5
 		fix(deps): update dependency @rails/ujs to v7.1.3 (#30356) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 07:56:28 +00:00
Claire
57fb2cf948 Merge commit '12472e7f40' into glitch-soc/merge-upstream 2024-05-17 12:33:41 +02:00
renovate[bot]
f7f5b9dadd
 		fix(deps): update dependency @rails/ujs to v7.1.3-3 (#30337) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-17 08:27:45 +00:00
Essem
4f37b4873f
 		Merge remote-tracking branch 'upstream/main' 2024-05-14 21:20:27 -05:00
Claire
666760f450 Merge commit '1bf661cddb' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream fixed a command we have modified in glitch-soc.
  Updated as upstream did.
 2024-05-14 20:47:14 +02:00
Nick Schonning
9ec7c1f892
 		Fix i18n:extract flags (#30261) 2024-05-13 09:42:47 +00:00
Claire
f35ba6963d Merge commit '1959365c2f' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
renovate[bot]
0a4a93038f
 		Update Yarn to v4.2.2 (#30220) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-10 09:22:47 +00:00
Essem
b636ca2099
 		Merge remote-tracking branch 'upstream/main' 2024-05-06 22:12:42 -05:00
ShittyKopper
c1a1050835 complete the merge 2024-05-06 04:48:46 +03:00
ShittyKopper
acf03b3841 Merge remote-tracking branch 'standalone/glitch' into standalone 2024-05-06 04:13:03 +03:00
Claire
3789d9f825 Merge commit 'b7902225d6' into glitch-soc/merge-upstream 
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests.
 2024-05-04 16:28:30 +02:00
Claire
a76980a229 Merge commit 'f0c9cbaf3b' into glitch-soc/merge-upstream 2024-05-04 15:40:07 +02:00
Claire
d6f9c97ae4 Merge commit '7201f99cf8' into glitch-soc/merge-upstream 2024-05-04 15:24:22 +02:00
Essem
a7b905d573
 		Merge remote-tracking branch 'upstream/main' 2024-05-02 23:31:54 -05:00