Merge Release 6.6.0 into main #1424
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 Ally Logo page (#1354) * Changed wagtail.core to wagtail * Changed wagtail.tests to wagtail.test * Set StreamField to have use_json_field parameter * FieldPanel changes * Update to Wagtail 3.0.3 * merge migrations after rebase * Updated merged code for Wagtail 3 * Updated base.txt and locked-requirements.txt
* development: Upgrade to Wagtail 3 (#1398)
Remove old research page
* adjusting data for frontend needs - add label to subject dropdown - split name field in testimonials - fix images coming from snippets - modify subject category labels - add titles and icons to resources - move resources to book level
* Fixed translation and locale in export * More improvements * Lookup documents by title when importing * Uncommented save of a page * All documents now included
This reverts commit a8d34c9.
Codecov Report
@@ Coverage Diff @@
## main #1424 +/- ##
==========================================
- Coverage 78.99% 78.47% -0.52%
==========================================
Files 125 125
Lines 6402 6440 +38
==========================================
- Hits 5057 5054 -3
- Misses 1345 1386 +41 |
mwvolo
approved these changes
Mar 9, 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.