Merge main into nextjs
#1710
Merged
Merge main into nextjs
#1710
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* make Dialog content scrollable * increase addtolistdialog query size
* testing initial migration change * testing initial migration change * moving static fixtures into data_fixtures app * restoring old management commands * fixing import * fixing imports and tests * updating dev init script to run datamigrations * restoring data migrations * adding defaults to get or create * adding defaults to get or create * adding docstring * removing duplicate backpopulate
This is a temporary remediation for staff-facing UI. The corresponding issue for public-facing userlist UI is being tracked via mitodl/hq#5776
* set color of facet drawer caret to silverGrayDark by default * set collapsed facet contents to visibility: hidden * fix style linting issue * use descendent selector instead of child selector * update course-search-utils * also hide search input on filterable facets
* conditionalizing for xpro platform * adding test * fixing types * fixing typo
* changing aria attribute and fixing tests * fixing typecheck * fixing parameter to getReadableResourceType
* Update dependency @ckeditor/ckeditor5-dev-translations to v43 * updating lockfile --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: shankar ambady <ambady@mit.edu>
* Update dependency @ckeditor/ckeditor5-dev-utils to v43 * udpating lockfile --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: shankar ambady <ambady@mit.edu>
* Update dependency @ckeditor/ckeditor5-react to v9 * updating lockfile * fixing lint * upgrading version of typescript es-lint to support current version of ts we use * upgrading all ckeditor submodules --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: shankar ambady <ambady@mit.edu>
Closed
ChristopherChudzicki
changed the base branch from
nextjs-unsquash-last-merge
to
nextjs
ChristopherChudzicki
added
the
Needs Review
ChristopherChudzicki
force-pushed
the
nextjs-merge-20241018
branch
from
e19ab82 to
e614768
Compare
ChristopherChudzicki
changed the title
main into nextjs more cleanlymain into nextjs
jonkafton
approved these changes
Oct 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What are the relevant tickets?
Supersedes #1708
Description (What does it do?)
Merges
mainintonextjsHow can this be tested?
Ensure that the branch runs locally and everything looks in order and recent changes in
mainhave been applied, with attention to these PRs:Checklist: