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

Adding our merge from oslab-beta/master to open-source-labs/dev #149

Merged
merged 1,190 commits into from
Mar 9, 2022
Merged

Conversation

williamowen65
Copy link
Contributor

Types of changes

  • Bugfix (change which fixes an issue)
  • New feature (change which adds functionality)
  • Refactor (change which changes the codebase without affecting its external behavior)
  • Non-breaking change (fix or feature that would cause existing functionality to work as expected)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Purpose

Adding our merge from oslab-beta to open-source-labs/dev

mjiang108 and others added 30 commits January 19, 2021 18:49
change plural to singular (e.g. orders -> order) in all backend file and variable names
Added functionality works, and file structure changes match general convention.
remove unnecessary code in clientwrapper.js and serverwrapper.js, wrap bookClient and bookServer
currently bookServer and bookClient are wrapped. adding metadata din client wrapper does not work. but adding metadata in reverseProxyServer and passing it as parameter to wrapper works.
currently bookServer and bookClient are wrapped. adding metadata din client wrapper does not work. but adding metadata in reverseProxyServer and passing it as parameter to wrapper works.
create metadata in reverseProxyServer and pass to clientwrapper, serverwrapper receives metadata and stores it in link, clientwrapper gets metadata from link. currently also able to console.log a mongo record

Co-authored-by: Derek <[email protected]>
Co-authored-by: Vince <[email protected]>
Co-authored-by: Kit <[email protected]>
Add initial gRPC controllers for mongoDB and postgreSQL
Modify config file to accept parameter of connection type
Rewrote logic for implementation of route tracing
Minor fix: add missing bracket
williamowen65 and others added 23 commits February 28, 2022 16:30
Co-authored-by: Alexander Holden <[email protected]>
Co-authored-by: jessllee <[email protected]>
Finishing touches on login, signup, and profile
Co-authored-by: Alexander Holden <[email protected]>
Co-authored-by: William Owen <[email protected]>
Co-authored-by: Jessica Lee <[email protected]>'
Co-authored-by: Alexander Holden <[email protected]>
Co-authored-by: William Owen <[email protected]>
Co-authored-by: Jessica Lee <[email protected]>
Co-authored-by: Alexander Holden <[email protected]>
Co-authored-by: William Owen <[email protected]>
Co-authored-by: Jessica Lee <[email protected]>

Merge branch 'master' of https://github.com/oslabs-beta/Chronos into exe.testing_merge
Contribution to Chronos for version 5.2
Copy link
Contributor

@astholden astholden left a comment

Choose a reason for hiding this comment

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

Looking good!

Copy link
Contributor

@jessllee jessllee left a comment

Choose a reason for hiding this comment

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

Updated Chronos, no breaking changes; Chronos still spins up properly and displays.

@Justinlkirk Justinlkirk merged commit e06b90e into dev Mar 9, 2022
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.