Merge Release v6.12 into main #1485
Merged
Conversation
This file contains 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
* Updated partner query, removed review sync and made all visible on website * Removed reviews and updated tests
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.1.1 to 9.3.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](python-pillow/Pillow@9.1.1...9.3.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Michael Volo <[email protected]>
* Add check on queryset for Resources * Added test for bad slug
… Salesforce (#1384) * Added checks for book before creating or sending to Salesforce * Edited if statement
Learning research page
* Added resource_category field to resource snippets * Added missing resource category on FacultyResource model for books
* adding assignable resource * Update 0053_alter_errata_resource.py
* Resource external link no longer required * Made link text not required
* Fixed resource link still being required * Fixed menu change * Removed validation errors on resources * Added About field * Removed locked-requirements.txt to prevent dependabot PRs
* Tweaks to improve blog search results * Added subjects, categories and collections to search
…rtners (#1476) * Modified errata query to prefetch book, removed review totals from Partners * Fixed query * undo last commit
* Handle exporting non-book pages * Changed content type check * improvements for non-book pages * Import working for non-book pages * added missing function and removed unused function * Removed print statements
mwvolo
approved these changes
Jul 13, 2023
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.
No description provided.