Skip to content

Rc2.6.1#261

Merged
rosemcc merged 69 commits into
prodfrom
rc2.6.1
Mar 21, 2022
Merged

Rc2.6.1#261
rosemcc merged 69 commits into
prodfrom
rc2.6.1

Conversation

rosemcc and others added 30 commits December 14, 2021 13:16
Bumps [nodemon](https://github.com/remy/nodemon) from 2.0.12 to 2.0.15.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v2.0.12...v2.0.15)

---
updated-dependencies:
- dependency-name: nodemon
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [contentful-export](https://github.com/contentful/contentful-export) from 7.13.34 to 7.14.11.
- [Release notes](https://github.com/contentful/contentful-export/releases)
- [Commits](contentful/contentful-export@v7.13.34...v7.14.11)

---
updated-dependencies:
- dependency-name: contentful-export
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…b-search-proxy/contentful-export-7.14.11

Bump contentful-export from 7.13.34 to 7.14.11 in /hub-search-proxy
Bumps [nodemon](https://github.com/remy/nodemon) from 2.0.12 to 2.0.15.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v2.0.12...v2.0.15)

---
updated-dependencies:
- dependency-name: nodemon
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…r-graphql/nodemon-2.0.15

Bump nodemon from 2.0.12 to 2.0.15 in /cer-graphql
* added animation to notification

* 1st version remember persistant notification

* refactored notification request into service

* formatting

* code cleanup and comments

* minor fix to method description

* more changes to comments

* unit tests for getNotification() function

* removed some unused code from unit test

* added test for storeCurrentNotificationVersion

* improved close function

* removed focused describe

Co-authored-by: Rose <31844476+rosemcc@users.noreply.github.com>
* remove unused dependencies and use lockfile version 2

* update sentry to latest

* update rxjs, npm audit fix

* fix interface change to iif() in rxjs 7

* fix chunkload error

Co-authored-by: rosemcc <rosemccoll@hotmail.com>
rosemcc and others added 18 commits March 7, 2022 16:44
* WIP

* WIP

* set graphql server as ecypress env variable, clean up

* bodyMediaList should be a class, fix naming style also, give body media specific ids for testing

* improvements,  .should('not.be.empty') to .should('exist')

* add more funding tests

* add caseStudy mock and tests

* subhub mock data and tests

* article mock and tests, remove console logs

* software mock and tests, remove example.json

* events mock and tests

* service mock data and tests

* equipment mock data and tests

* improved homepage tests

* set wider viewport for testing

* rename basic-functionality to navbar, add navbar tests

* add sso content test

* categories and activities pages tests

* add search page tests

* minor changes for routing tests

* try to fix e2e fixtures on ci

* still fixing ci

* comments, remove unneeded log message

* wording

Co-authored-by: Lukas Trombach <19306765+Trombach@users.noreply.github.com>

* Update research-hub-web/cypress/utils/graphql-utils.ts

Co-authored-by: Lukas Trombach <19306765+Trombach@users.noreply.github.com>

* Update research-hub-web/cypress/integration/navbar.e2e.ts

Co-authored-by: Lukas Trombach <19306765+Trombach@users.noreply.github.com>

* minor fix

Co-authored-by: Lukas Trombach <19306765+Trombach@users.noreply.github.com>
…hub-web (#232)

* Bump @contentful/rich-text-types in /research-hub-web

Bumps [@contentful/rich-text-types](https://github.com/contentful/rich-text) from 14.1.2 to 15.11.1.
- [Release notes](https://github.com/contentful/rich-text/releases)
- [Changelog](https://github.com/contentful/rich-text/blob/master/CHANGELOG.md)
- [Commits](contentful/rich-text@v14.1.2...v15.11.1)

---
updated-dependencies:
- dependency-name: "@contentful/rich-text-types"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* also update ngx-contentful-rich-text

* CommonJs warning

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: rosemcc <rosemccoll@hotmail.com>
Co-authored-by: Rose <31844476+rosemcc@users.noreply.github.com>
* still render page if a draft image is linked to

* handle no image on activities page
* Bump @apollo/client from 3.4.13 to 3.5.10 in /research-hub-web

Bumps [@apollo/client](https://github.com/apollographql/apollo-client) from 3.4.13 to 3.5.10.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/main/CHANGELOG.md)
- [Commits](apollographql/apollo-client@v3.4.13...v3.5.10)

---
updated-dependencies:
- dependency-name: "@apollo/client"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* fix deprecated throwerror to use errorFactory

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: rosemcc <rosemccoll@hotmail.com>
Bumps [contentful](https://github.com/contentful/contentful.js) from 9.1.5 to 9.1.13.
- [Release notes](https://github.com/contentful/contentful.js/releases)
- [Commits](contentful/contentful.js@v9.1.5...v9.1.13)

---
updated-dependencies:
- dependency-name: contentful
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…b-search-proxy/contentful-9.1.13

Bump contentful from 9.1.5 to 9.1.13 in /hub-search-proxy
Bumps [contentful](https://github.com/contentful/contentful.js) from 9.1.13 to 9.1.18.
- [Release notes](https://github.com/contentful/contentful.js/releases)
- [Commits](contentful/contentful.js@v9.1.13...v9.1.18)

---
updated-dependencies:
- dependency-name: contentful
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…b-search-proxy/contentful-9.1.18

Bump contentful from 9.1.13 to 9.1.18 in /hub-search-proxy
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1058.0 to 2.1095.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-js@v2.1058.0...v2.1095.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…r-graphql/aws-sdk-2.1095.0

Bump aws-sdk from 2.1058.0 to 2.1095.0 in /cer-graphql
Copy link
Copy Markdown
Contributor

@Trombach Trombach 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
Copy Markdown
Collaborator

@cameronmclean cameronmclean left a comment

Choose a reason for hiding this comment

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

:) looks great. Go 2.6.1 !

@rosemcc rosemcc merged commit ba434d4 into prod Mar 21, 2022
@rosemcc rosemcc deleted the rc2.6.1 branch January 12, 2026 03:17
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.

4 participants