JellySolutions/ufund-ui/src/app/components/funding-basket, branch v3.0 An online U-Fund system focused on coral reef and marine life conservation Merge branch 'main' into light-mode 2025-04-07T20:49:21+00:00 sowgro tpoke.ferrari@gmail.com 2025-04-07T20:49:21+00:00 8b64b8bd43f987b924d74d0ea597b7b606ca9357 # Conflicts: # ufund-ui/src/styles.css 
# Conflicts:
#	ufund-ui/src/styles.css
Merge remote-tracking branch 'origin/main' 2025-04-07T18:04:11+00:00 Gunther6070 haydenhartman10@yahoo.com 2025-04-07T18:04:11+00:00 791dafcf058230f6fe3f3cfbf6ca179e1caeca81 






Added total physical contributions to dashboard and funding basket
2025-04-07T18:03:59+00:00

Gunther6070
haydenhartman10@yahoo.com

2025-04-07T18:03:59+00:00

81917b7cae6d3d22bc8e54f7b2bd416acd70475f












Disable pagination in checkout
2025-04-07T17:37:01+00:00

sowgro
tpoke.ferrari@gmail.com

2025-04-07T17:37:01+00:00

d2858b59e495186d51eebd188f84534fe68fc420












Improve sort-scheme
2025-04-06T23:52:12+00:00

sowgro
tpoke.ferrari@gmail.com

2025-04-06T23:52:12+00:00

88865595e2735784537e076a5b8d6edbf6fb6138












Complete back-merge
2025-04-06T19:27:38+00:00

sowgro
tpoke.ferrari@gmail.com

2025-04-06T19:27:38+00:00

ca4443d0d0c5e2a3ee31ffe4a957bcfc3cac8114












Merge branch 'main' into light-mode
2025-04-06T19:15:47+00:00

sowgro
tpoke.ferrari@gmail.com

2025-04-06T19:15:47+00:00

9f14b3787a8cfc49fd168b1242adcc6d5fa8bfd6

# Conflicts:
#	ufund-ui/src/app/app.component.html
#	ufund-ui/src/app/components/funding-basket/funding-basket.component.html
#	ufund-ui/src/app/components/need-list/need-list.component.html
#	ufund-ui/src/app/components/need-page/need-page.component.css





# Conflicts:
#	ufund-ui/src/app/app.component.html
#	ufund-ui/src/app/components/funding-basket/funding-basket.component.html
#	ufund-ui/src/app/components/need-list/need-list.component.html
#	ufund-ui/src/app/components/need-page/need-page.component.css







finish styling basket and list; add persistent theme via localStorage. -ak
2025-04-06T02:00:00+00:00

Akash Keshav
112591754+domesticchores@users.noreply.github.com

2025-04-06T02:00:00+00:00

1ac878b4aaa19ab889c7a98b7dab6acd57c778b3












Merge pull request #29 from RIT-SWEN-261-02/need-image
2025-04-06T00:18:10+00:00

Tyler Ferrari
69283684+Sowgro@users.noreply.github.com

2025-04-06T00:18:10+00:00

95798c2b81da7f950850a6bb3c5be28e0323d5ba

local persistence for need list data




local persistence for need list data






Fix storage after merge
2025-04-05T20:29:05+00:00

sowgro
tpoke.ferrari@gmail.com

2025-04-05T20:29:05+00:00

80492e8f6f88bff8035e27b814cc9eacbee40c65