Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Release v6.15.0 into main #1498

Merged
merged 94 commits into from
Aug 29, 2023
Merged

Merge Release v6.15.0 into main #1498

merged 94 commits into from
Aug 29, 2023

Conversation

edwoodward
Copy link
Contributor

No description provided.

edwoodward and others added 30 commits October 18, 2022 09:11
* 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
edwoodward and others added 21 commits June 2, 2023 06:58
* Code for adding menus for site to CMS

* Menus working, but improvements needed

* Made cleaner json

* Added tests
* 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
* Added collections and search to webinar page

* Fixed search and search url

* Removed print stmts and added test for search

* Removed unneeded import

* Removed websearch parameter

* Added tests for 2 pages

* changed name of webinar search API
* Sitemap fix for k12 and new subjects page

* fixed k12 sitemap

* New subjects page is in sitemap if flag is set to display

* Now deals with -books on subject slugs correctly
@edwoodward edwoodward self-assigned this Aug 24, 2023
@edwoodward edwoodward changed the title Release v6.15.0 Merge Release v6.15.0 into main Aug 24, 2023
@codecov
Copy link

codecov bot commented Aug 24, 2023

Codecov Report

Merging #1498 (b2620fa) into main (8f535a2) will increase coverage by 0.11%.
The diff coverage is 85.79%.

@@            Coverage Diff             @@
##             main    #1498      +/-   ##
==========================================
+ Coverage   79.29%   79.41%   +0.11%     
==========================================
  Files         132      133       +1     
  Lines        6723     6882     +159     
==========================================
+ Hits         5331     5465     +134     
- Misses       1392     1417      +25     

@edwoodward edwoodward requested a review from mwvolo August 24, 2023 20:30
@edwoodward edwoodward merged commit 20935c1 into main Aug 29, 2023
2 checks passed
@edwoodward edwoodward deleted the release-v6.15.0 branch August 29, 2023 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants