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

Merge Release/2024 q3 into master #27

Merged
merged 260 commits into from
Oct 1, 2024
Merged

Merge Release/2024 q3 into master #27

merged 260 commits into from
Oct 1, 2024

Conversation

SaikrishnaBairamoni
Copy link
Contributor

PR Details

Merge Release/2024 q3 into master for ode release

Description

How Has This Been Tested?

Types of changes

  • Defect fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that cause existing functionality to change)

Checklist:

  • My changes require new environment variables:
    • I have updated the docker-compose, K8s YAML, and all dependent deployment configuration files.
  • My changes require updates to the documentation:
    • I have updated the documentation accordingly.
  • My changes require updates and/or additions to the unit tests:
    • I have modified/added tests to cover my changes.
  • All existing tests pass.

dmccoystephenson and others added 30 commits April 12, 2024 16:18
@dmccoystephenson
Merge branch 'dev' into feature/optional-tls-and-auth-for-contact-sup…
db79216 
…port-menu
@dmccoystephenson
Modified email formatting in emailSender.py
7030b78
@dmccoystephenson
Removed an argument
46a243d
@jacob6838
Adding intersections to main map page
fb04c08
@jacob6838
Adding payload types to rsu slice
e7f726a
@jacob6838
Improving intersection map data type selector
0145d4d
@Michael7371
init commit for obu ota server
f450bb6
@jacob6838
Fully working CIMMS map page!
84392ae
@jacob6838
Merge branch 'develop' into conflictvisualizer-map-page
e7ac82a
@jacob6838
Updating setBsmFilterStep
37354fd
@jacob6838
Updating dockerfile with new env vars
d325a00
@Michael7371
updating ota server unit tests
82ede15
@jacob6838
Fixing various warnings
dcfff87
@jacob6838
Updating BSM counts start/end time text color
d8b9f69
@Michael7371
updates with unit tests
6691d93 
added unit tests
added docker compose to spin up local deployment
tested on k8 cluster
@mwodahl
Add docker-compose-mongo.yml for local MongoDB support
d3e7377
@mwodahl
Update mongo-setup image
67ec16d
@jacob6838
Merge branch 'develop' into conflictvisualizer-map-page
e99e27c
@jacob6838
Updating errors in type definitions
cfc9f7c
@jacob6838
Merging recent conflictvisualizer changes
0eff4c6
@jacob6838
Fixing cviz bsm colors error
cb333b5
@jacob6838
Tweaking cimms popup display
75feb32
@jacob6838
Fixing PR comments, removing comments
d653c7d
@jacob6838
Removing unnecessary images, updating documentation
b36ea67
@jacob6838
Removing updateGeoMsg comments and prints
63366da
@jacob6838
Removing rsu_ip from intersection selection menu
0d2a17f
@jacob6838
Adding SSM/SRM menu to intersection map
89bae4d
@jacob6838
Adding conflictmonitor release-compose
8348e68
@jacob6838
Working CIMMS integration with release-compose
e93e680
@jacob6838
Fixing formatting on map view
5591922
payneBrandon and others added 27 commits August 23, 2024 14:52
@payneBrandon
Merge pull request #93 from CDOT-CV/cimms-dashboard
2af4570 
Cimms dashboard
@jacob6838
Removing unnecessary code comments
213051d
@Michael7371
fix broken unit tests
4fb7ace
@drewjj
Update the webapp tests to resolve failing checks
380b214
@mwodahl
merge branch 'develop' into Feature/emailer-customization
3c1f136
@jacob6838
Increasing keycloak docker max retries
a212f7d
@payneBrandon
Merge pull request #58 from CDOT-CV/conflictvisualizer-map-page
7f9abf3 
Conflictvisualizer Map Page Integration
@drewjj
Merge remote-tracking branch 'origin/develop' into Feature/mui-dialogs
a4b5a5a
@drewjj
Update headers while dialog boxes are open
ad3c0d0
@payneBrandon
Merge pull request #101 from CDOT-CV:Feature/org-emails
a709942 
Organization Emails
@drewjj
Merge pull request #95 from CDOT-CV/Feature/mui-dialogs
89fd441 
Add Material UI Dialogs
@drewjj
Merge remote-tracking branch 'origin/develop' into Feature/emailer-cu…
c5311df 
…stomization
@drewjj
Update branch to fix pages after the changes made to resolve merge co…
077dad5 
…nflicts
@drewjj
Remove comment
6ad03c3
@mwodahl
Remove unnecessary rows, pull notification data on first render
bb32020
@dmccoystephenson
Added default values of "true" for TLS & AUTH toggles
94c8e51
@dmccoystephenson
Merge pull request #12 from Trihydro/optional-tls-auth/default-to-true
e4d26aa 
Added default values of "true" for TLS & AUTH toggles
@drewjj
Merge pull request #22 from Trihydro/dev
9dbca7c 
Optional TLS/Authentication for Contact Support Menu
@drewjj
Merge pull request #81 from CDOT-CV/Feature/emailer-customization
05e46e5 
Add emailer customization menu
@drewjj
Added release notes
4f209aa
@drewjj
Merge remote-tracking branch 'upstream/develop' into Update/release-n…
368d5ea 
…otes-1.4.0
@drewjj
Resolve failing test
0865ce7
@drewjj
Merge pull request #102 from CDOT-CV/Update/release-notes-1.4.0
cbb082c 
Release Notes 1.4.0 And Resolve Upstream Conflicts
@drewjj
Merge pull request #24 from CDOT-CV/develop
a029096 
Conflict Visualizer Integration, Commsignia OBU OTA Support & Custom Email Features
@drewjj
Fix issue with TLS and Auth requirements not defaulting to True
d269644
@drewjj
Merge pull request #103 from CDOT-CV/Fix/update-emailer-defaults
679d0b9 
Fix Email TLS and Auth Defaults
@payneBrandon
Merge pull request #26 from CDOT-CV/develop
6c101ec 
Fix Email TLS and Auth Defaults
@dan-du-car dan-du-car merged commit 5872195 into master Oct 1, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dan-du-car dan-du-car dan-du-car approved these changes

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

Successfully merging this pull request may close these issues.
8 participants
@SaikrishnaBairamoni @dan-du-car @dmccoystephenson @jacob6838 @Michael7371 @mwodahl @drewjj @payneBrandon