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 2.3 into main #2083

Merged
merged 186 commits into from
Oct 22, 2024
Merged

Merge 2.3 into main #2083

merged 186 commits into from
Oct 22, 2024

Conversation

sukhpalp
Copy link
Collaborator

No description provided.

sukhpalp and others added 30 commits May 9, 2024 08:58
* Add CORS Config for Cloudfront

* Test uses dev APIs

* Split header policies and use the non auth one for maps

* Add capacitor

* Add Android origin

* https instead of http

* Add localhost for old android
* Add storybook to project

* Add checkbox-button

* Add stories

* Clean up

* Reorganize stories

* Node version bump

* Remove google-services
* wip, banner part

* wfnews-2097

* add storybook

* modify storybook data

* css change after code review
* WFNEWS-2160 Add resource management service

* wfnews-2160 Add resource mgmt service

* Add WFRM terraform config

* Clean up

* Fix wfrmSchedule config
* WFNEWS-2160 Add resource management service

* wfnews-2160 Add resource mgmt service

* Add WFRM terraform config

* Clean up

* Fix wfrmSchedule config

* Append missing comma in config.jsp
* wfnews-2102

* move incident tabs to separate component
* make use of back button
* fix badge wrap issue
* 2182 2183 2185

* wfnews-2100

* back button adjustment

* open lightGallery on click all photos button

* css adjustment
* 2182 2183 2185

* wfnews-2100

* back button adjustment

* open lightGallery on click all photos button

* css adjustment

* zoom to extend in header panel
* WFNEWS-2132 RM integration

* Remove duplicatesvg

* Adjustments
* WFNEWS-2132 RM integration

* Remove duplicatesvg

* Adjustments

* WFNEWS-2132 fix undefined bug on editor
* 2182 2183 2185

* wfnews-2098

* switch evac layer to openmaps source

* REVERT -switch evac layer to openmaps source

* code review change

* revert appconfig.json
* 2182 2183 2185

* align icons

* 2189 2190 2191

* 2189 2190 2191
* Add icons page

* Fix icon mapping

* Add interaction test

* Add rest of icons
* WFNEWS-2198 set submittedTimestamp from ROF payload

* WFNEWS-2198 Add missing timestamp conversion
yzlucas and others added 16 commits August 1, 2024 15:59
…2071)

* Shorten TTL of statistics cache

* Add FoN to Active Wildfire counts
* wfnews-2390

* wfnews-2390

---------

Co-authored-by: Sukh <6563909+sukhpalp@users.noreply.github.com>
* Shorten TTL of statistics cache

* Add FoN to Active Wildfire counts

* Change to use DeclaredOutDate

* Add previous year stats to Wildfire Cause widgets

* Remove previousYearOut totals

* Fix totals
* Shorten TTL of statistics cache

* Add FoN to Active Wildfire counts

* Change to use DeclaredOutDate

* Add previous year stats to Wildfire Cause widgets

* Remove previousYearOut totals

* Fix totals

* Fix stage of control counts
* Update target/compile android version

* Update version number to 2.3.7
* Bump to 2.3.7
* Visible Flames boolean

* Fix dependencies
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.

6 participants