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 master branch into develop #38

Merged
merged 1,336 commits into from
Feb 7, 2025
Merged

Sync master branch into develop #38

merged 1,336 commits into from
Feb 7, 2025

Conversation

SaikrishnaBairamoni
Copy link
Contributor

PR Details

Sync master branch into develop for 2025-q1 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.

mwodahl and others added 30 commits January 14, 2025 08:55
@mwodahl
Merge pull request #113 from CDOT-CV/Feature/collapsible-menu
28b6cc7 
Collapsible Map Menu
@dmccoystephenson @jacob6838
Update docs/Release_notes.md
7cc09d3 
Co-authored-by: jacob6838 <51723791+jacob6838@users.noreply.github.com>
@dmccoystephenson
Merge pull request #134 from CDOT-CV/docs/2025-q1/update-release-notes
8abe2e4 
Updated `Release_notes.md` for 2025 Q1 release
@jacob6838
Updating intersection api mongo creds
8da380b
@payneBrandon
Merge pull request #137 from CDOT-CV/fixing-auto-checks
dad85b5 
Fixing CI Checks
@jacob6838
Merge branch 'develop' into normalizing-line-endings
0cc0d4f
@payneBrandon
Merge pull request #136 from CDOT-CV/normalizing-line-endings
9d2ca82 
Normalizing line endings
@jacob6838
Merge branch 'develop' into conflictvisualizer-api-integration
674d699
@jacob6838
Merge branch 'conflictvisualizer-api-integration' of https://github.c…
593eb0b 
…om/CDOT-CV/jpo-cvmanager into conflictvisualizer-api-integration
@jacob6838
Merge branch 'develop' into conflictvisualizer-api-integration
de6c15d
@John-Wiens
Adding embedded mongo and postgres
4a781dc
@jacob6838
Adding rsu online/scms status to collapsible map menu
1b3a964
@jacob6838
Updating test snapshots
95f6db2
@jacob6838
Tweaking rsu status formatting
fbf8c60
@jacob6838
Updating test snapshots
397c8f2
@jacob6838
Update CM_MONGO_AUTH_DB in sample.env
a4280e4
@jacob6838
Merge pull request #140 from CDOT-CV/api-unit-test-fixes
6eacd32 
Adding embedded mongo and postgres
@dmccoystephenson
Added CDOT PRs 136, 137 & 140 to 2025 Q1 release notes
63398c1
@dmccoystephenson @jacob6838
Update docs/Release_notes.md
78f4c20 
Co-authored-by: jacob6838 <51723791+jacob6838@users.noreply.github.com>
@jacob6838
Fixing typos and small working changes
ac1340f
@jacob6838
Adding mongo_scripts readme
b6ff92d
@jacob6838
Removing unused mockDecode in BsmDecoder
6ffbd81
@John-Wiens
Switching Zonky to use internal postgres instead of docker version
3053f49
@jacob6838
Merge pull request #143 from CDOT-CV/api-unit-test-fixes
36acfea 
Switching Zonky to use internal postgres instead of docker version
@jacob6838
Adding intersection api to CI pipeline
f97af63
@dmccoystephenson
Added CDOT PR 143 to 2025 Q1 release notes
1163401
@drewjj
Merge pull request #141 from CDOT-CV/rsu-online-status-fix
b802539 
Re-Adding RSU Online/SCMS Status Switch
@jacob6838
Update ci.yml
97c465c
@jacob6838
Update ci.yml
692bd76
@jacob6838
Update ci.yml
03f94be
Michael7371 and others added 27 commits February 4, 2025 10:21
@Michael7371
fix duplicate points from being added on polygon close
9ea4818
@jacob6838
Fixing tests and snapshots
1fc78ec
@Michael7371
Merge branch 'develop' into geo-msg-query-updates
ee44913
@Michael7371
develop merge updates
262609b
@Michael7371
Merge remote-tracking branch 'origin/releast-testing-2025-02-03' into…
99f4aba 
… geo-msg-query-updates
@jacob6838
Merge remote-tracking branch 'origin/cdot-release-2025-q1' into relea…
9d5dba7 
…st-testing-2025-02-03
@jacob6838
Update Release_notes.md
a9fab49
@jacob6838
Merge pull request #151 from CDOT-CV/releast-testing-2025-02-03
d2998fe 
Issues from Release Testing 2025/02/03
@Michael7371
adds a unit test to verify query limit functionality
033a489
@Michael7371
fix unit test comments
479ff6b
@dmccoystephenson
Merge pull request #152 from CDOT-CV/cdot-release-2025-q1
7952a3e 
Synchronize Map Menu Bug Fixes From Release Branch
@SaikrishnaBairamoni
Merge pull request #35 from CDOT-CV/cdot-release-2025-q1
f07f93c 
Enhancements to User Management, Firmware Upgrades, UI/UX, and System Stability
@Michael7371
Merge branch 'develop' into geo-msg-query-updates
8364312
@Michael7371
Update Release_notes.md
0b9c2ec
@Michael7371 @jacob6838
Update docs/Release_notes.md
88faf80 
Co-authored-by: jacob6838 <51723791+jacob6838@users.noreply.github.com>
@Michael7371
removal of print statements, useMemo for Max offset, and adding toast…
d83f33d 
… loading notification
@Michael7371
Merge branch 'geo-msg-query-updates' of https://github.com/CDOT-CV/jp…
629054b 
…o-cvmanager into geo-msg-query-updates
@Michael7371
Merge pull request #150 from CDOT-CV/geo-msg-query-updates
63dff30 
Geo Message Query Updates & Transfer to Processed BSM Data
@Michael7371
updates to resolve cvmanager mongo
da167f7
@Michael7371
updates to fix mongo startup issues
8fb285d
@Michael7371
merge of cv manager mongo and conflict monitor mongo
bea89a0
@Michael7371
removal of unused setup script and references to old environmental va…
de57a32 
…riables
@Michael7371
fix database reference for jpo_count_metric
70743d7
@Michael7371
fix the cvmanager_api service mongo db reference
983d1b4
@drewjj
Merge pull request #154 from CDOT-CV/Fix/docker-compose-issues
8b38ef9 
Fix Mongo Startup Issues
@SaikrishnaBairamoni
Merge pull request #36 from CDOT-CV/cdot-release-2025-q1
8bf5c67 
Geo Message Query Updates & Transfer to Processed BSM Data
@SaikrishnaBairamoni
Merge pull request #37 from usdot-jpo-ode/release/2025-q1
bde7722 
Merge Release/2025 q1 into master
TonyEnglish
TonyEnglish approved these changes Feb 7, 2025
View reviewed changes
Copy link

@TonyEnglish TonyEnglish left a comment

Choose a reason for hiding this comment

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

thank you

@SaikrishnaBairamoni SaikrishnaBairamoni merged commit 2af518c into develop Feb 7, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TonyEnglish TonyEnglish TonyEnglish 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.
9 participants
@SaikrishnaBairamoni @TonyEnglish @mwodahl @dmccoystephenson @jacob6838 @payneBrandon @John-Wiens @drewjj @Michael7371