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.

Sign up for GitHub

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

Jump to bottom

Sync from Simplified PR #350 / commit 6f88c82 #8

Merged
merged 15 commits into from
Jul 19, 2021
Merged

Sync from Simplified PR #350 / commit 6f88c82 #8

merged 15 commits into from
Jul 19, 2021

Conversation

tdilauro
Copy link
Contributor

@tdilauro tdilauro commented Jul 12, 2021 •
edited
Loading

Description

Sync up with Simplified circulation-web v0.5.1+ (PR #350 / commit 6f88c82).

Contains:

  • Some security fixes.
  • More systemic fix for the footer layout issue.
  • "Added a custom Mocha reporter so that a formatted list of suites and tests can be generated via the CLI."
  • Clarifications in README.md.

I also had to make a few changes extra changes:

  • Address restrictions imposed by the npx lint-staged check that runs as a pre-commit hook.
  • Dropped our PR template and accepted the upstream one to make future syncs easier. They are identical and result in identical behavior. They were just in different places.

Checklist:

  • I have updated the documentation accordingly.
  • All new and existing tests passed.

adriana-alter and others added 15 commits May 4, 2021 13:43
@adriana-alter
Mocha reporter
e0ea66c
@adriana-alter
it doesn't seem to have committed the important file the first time...
26d29fa
@EdwinGuzman
Updating packages and minor updates to types
43a3cf5
@EdwinGuzman
Updating opds-web-client version and types
0d1276c
@EdwinGuzman
Merge pull request #345 from NYPL-Simplified/list-tests
4cc8c32 
List tests
@EdwinGuzman
merging and fixing conflicts from master
986a1da
@EdwinGuzman
Merge pull request #346 from NYPL-Simplified/npm-security-fixes
89567ff 
Updating packages and minor updates to types
@EdwinGuzman
Bumping up version to 0.5.0
cd09194
@oliviawongnyc
Made footer consistent on all pages and ensured page elements display…
81e2053 
… correctly
@oliviawongnyc
Removed commented code
6734e48
@oliviawongnyc
Merge pull request #347 from NYPL-Simplified/SIMPLY-3810/footer-bugfix
14d31d0 
Made footer consistent on all pages and ensured page elements display…
@oliviawongnyc
Updates the README, adds a PR template
13735a4
@oliviawongnyc
Updates per Edwin feedback
a87e6ec
@oliviawongnyc
Merge pull request #350 from NYPL-Simplified/SIMPLY-3823/updates-to-R…
6f88c82 
…EADME-and-GH-template

Updates the README, adds a PR template
@tdilauro
Resolve conflicts from upstream.
1e9cec6
ray-lee
ray-lee approved these changes Jul 12, 2021
View reviewed changes
Copy link
Contributor

@ray-lee ray-lee left a comment

Choose a reason for hiding this comment

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

Looks good to me! (I really only reviewed the last commit from Tim, on the assumption we want everything from upstream.)

@tdilauro tdilauro merged commit 45fe243 into main Jul 19, 2021
@tdilauro tdilauro deleted the merge-from-simplified branch July 19, 2021 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ray-lee ray-lee ray-lee approved these changes

@jonathangreen jonathangreen Awaiting requested review from jonathangreen

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tdilauro @ray-lee @adriana-alter @EdwinGuzman @oliviawongnyc