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 main into dev May 25th #76

Merged
merged 7 commits into from
May 26, 2022
Merged

Merge main into dev May 25th #76

merged 7 commits into from
May 26, 2022

Conversation

Dref360
Copy link
Contributor

@Dref360 Dref360 commented May 25, 2022

I did a merge, not sure if it was the right thing to do. Rebase gave me a lot of modified files.

  • Clean up using destructuring assignment to avoid repeating wordCount 5 times
  • Make clicking a top word a second time clear search
  • Double underline of selected top word
  • Document top words links
  • Update screenshot
  • Fix link styling in table rows## Description:

Checklist:

You should check all boxes before the PR is ready. If a box does not apply, check it to acknowledge
it.

  • PRE-COMMIT. You ran pre-commit on all commits, or else, you
    ran pre-commit run --all-files at the end.
  • FRONTEND TYPES. Regenerate the front-ent types if you played with types and routes.
    Run cd webapp && yarn types while the back-end is running.
  • USER CHANGES. The changes are added to CHANGELOG.md and the documentation, if they impact
    our users.
  • DEV CHANGES.
    • Update the documentation if this PR changes how to develop/launch on the app.
    • Update the README files and our wiki for any big design decisions, if relevant.
    • Add unit tests, docstrings, typing and comments for complex sections.

JosephMarinier and others added 7 commits May 5, 2022 23:31
* Clean up using destructuring assignment to avoid repeating `wordCount` 5 times
* Make clicking a top word a second time clear search
* Double underline of selected top word
* Document top words links
* Update screenshot
* Fix link styling in table rows
* Add Git flow instruction to documentation

* Update docs/docs/development/dev-practices.md
Fixed typo "Sean Hugues" to "Sean Hughes" and added comma after "Sethu Meiyappan,"
@Dref360 Dref360 merged commit d0ecbf1 into dev May 26, 2022
@Dref360 Dref360 deleted the merge/main_into_dev_may_25 branch May 26, 2022 13:36
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.

None yet

4 participants