merge main into ClarisaBranch2#35

Closed

Clarisa-A wants to merge 19 commits intoClarisaBranch2from

Commits on Nov 24, 2025

adding location to forecast and adding multiple date selection feature to calendar
ljones2705
committed
Merge pull request #28 from Haileyboo111/Hailey2
Haileyboo111
authored
Merge pull request #31 from Haileyboo111/Lola4
Haileyboo111
authored
user login system

Isabelle Cox
authored and
Isabelle Cox
committed
Regenerate package-lock.json to resolve merge conflicts

Isabelle Cox
authored and
Isabelle Cox
committed
Regenerate package-lock.json to resolve merge conflicts

Isabelle Cox
authored and
Isabelle Cox
committed
Merge branch 'main' into IsabelleBranch3
isabellecoxx
authored
Merge pull request #32 from Haileyboo111/IsabelleBranch3
isabellecoxx
authored
Regenerate package-lock.json to resolve merge conflicts

Isabelle Cox
authored and
Isabelle Cox
committed
delete WeatherWatch/backend/users.db
isabellecoxx
authored
Add backend users database to .gitignore
isabellecoxx
authored
test cases

Isabelle Cox
authored and
Isabelle Cox
committed
Merge pull request #33 from Haileyboo111/IsabelleBranch3
isabellecoxx
authored
finalized styling
ljones2705
committed
Merge branch 'main' of https://github.com/Haileyboo111/WeatherWatchApp
ljones2705
committed
debug
ljones2705
committed
debugging CI/CD tests
Haileyboo111
committed
jest errors
Haileyboo111
committed

Commits on Nov 27, 2025

debugging login/registration frontend to backend
Haileyboo111
committed