Skip to content

Scheduled Merge: dev to prod#1332

Merged
JackyFTW merged 36 commits intoprodfrom
dev
Mar 5, 2026
Merged

Scheduled Merge: dev to prod#1332
JackyFTW merged 36 commits intoprodfrom
dev

Conversation

@github-actions
Copy link

@github-actions github-actions bot commented Mar 2, 2026

Automated PR created by GitHub Actions on a semi-weekly schedule.

Owen Luts and others added 23 commits February 17, 2026 12:06
Updated the entry for Elaina Trapatsos by changing the last parameter from '{}' to null.
Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.12.6 to 6.14.0.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](ajv-validator/ajv@v6.12.6...v6.14.0)

---
updated-dependencies:
- dependency-name: ajv
  dependency-version: 6.14.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Updated Gabby Addotey's LinkedIn link format from null to an empty array.
…m-the-db

added elaina and updated team members
…ajv-6.14.0

Bump ajv from 6.12.6 to 6.14.0 in /client
Bumps [dottie](https://github.com/mickhansen/dottie.js) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/mickhansen/dottie.js/releases)
- [Commits](mickhansen/dottie.js@v2.0.6...v2.0.7)

---
updated-dependencies:
- dependency-name: dottie
  dependency-version: 2.0.7
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [rollup](https://github.com/rollup/rollup) from 2.79.2 to 2.80.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/v2.80.0/CHANGELOG.md)
- [Commits](rollup/rollup@v2.79.2...v2.80.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-version: 2.80.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps  and [minimatch](https://github.com/isaacs/minimatch). These dependencies needed to be updated together.

Updates `minimatch` from 3.1.2 to 3.1.5
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.5)

Updates `minimatch` from 9.0.5 to 9.0.9
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.5)

Updates `minimatch` from 5.1.6 to 5.1.9
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.5)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-version: 3.1.5
  dependency-type: indirect
- dependency-name: minimatch
  dependency-version: 9.0.9
  dependency-type: indirect
- dependency-name: minimatch
  dependency-version: 5.1.9
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Added comments to handle compatibility issues with the 'crypto' library in older systems.
…dottie-2.0.7

Bump dottie from 2.0.6 to 2.0.7 in /server
Removed console log for public key in RSAEncryption.
…m-nitpicks

1335 task krutz has more quantum nitpicks
@JackyFTW JackyFTW requested review from JackyFTW and shmowen March 3, 2026 21:58
JackyFTW and others added 5 commits March 3, 2026 17:07
Bumps [immutable](https://github.com/immutable-js/immutable-js) from 4.3.5 to 4.3.8.
- [Release notes](https://github.com/immutable-js/immutable-js/releases)
- [Changelog](https://github.com/immutable-js/immutable-js/blob/main/CHANGELOG.md)
- [Commits](immutable-js/immutable-js@v4.3.5...v4.3.8)

---
updated-dependencies:
- dependency-name: immutable
  dependency-version: 4.3.8
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
dependabot bot and others added 8 commits March 5, 2026 16:21
Bumps  and [minimatch](https://github.com/isaacs/minimatch). These dependencies needed to be updated together.

Updates `minimatch` from 3.1.2 to 3.1.5
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.5)

Updates `minimatch` from 9.0.5 to 9.0.9
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.5)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-version: 3.1.5
  dependency-type: indirect
- dependency-name: minimatch
  dependency-version: 9.0.9
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…multi-770cfcd984

Bump minimatch in /server
…immutable-4.3.8

Bump immutable from 4.3.5 to 4.3.8 in /client
…nswer-color

Fix Multi-Select Quiz Answer Color
…favorite-lab-is-0

Fix Team Members Whose Favorite Lab is 0
…multi-ca49cfd856

Bump minimatch in /client
…rollup-2.80.0

Bump rollup from 2.79.2 to 2.80.0 in /client
…-chow-feedback

Fix Header Styling for Chow
Copy link
Contributor

@JackyFTW JackyFTW left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@shmowen shmowen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good shit type shit

@JackyFTW JackyFTW merged commit f807175 into prod Mar 5, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants