JellySolutions - An online U-Fund system focused on coral reef and marine life conservation

	Commit message (Collapse)	Author	Age
*	Add overfund warningv3.1	sowgro	2025-04-08
\|
*	Merge branch 'main' into light-mode	sowgro	2025-04-07
\|\ \| \| \| \| \| \| \| \|	# Conflicts: # ufund-ui/src/styles.css
\| *	Merge remote-tracking branch 'origin/main'	Gunther6070	2025-04-07
\| \|\
\| \| *	Disable pagination in checkout	sowgro	2025-04-07
\| \| \|
\| * \|	Added total physical contributions to dashboard and funding basket	Gunther6070	2025-04-07
\| \|/
* \|	Improve sort-scheme	sowgro	2025-04-06
\| \|
* \|	Complete back-merge	sowgro	2025-04-06
\| \|
* \|	Merge branch 'main' into light-mode	sowgro	2025-04-06
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# 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
\| *	Merge pull request #29 from RIT-SWEN-261-02/need-image	Tyler Ferrari	2025-04-05
\| \|\ \| \| \| \| \| \|	local persistence for need list data
\| \| *	Fix storage after merge	sowgro	2025-04-05
\| \| \|
\| * \|	Merge branch 'main' into checkout-improvement	Gunther6070	2025-04-05
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # ufund-ui/src/app/components/funding-basket/funding-basket.component.html # ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
\| \| *	Fix typos	sowgro	2025-04-04
\| \| \|
\| \| *	Merge branch 'main' into need-list-abstraction	sowgro	2025-04-04
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # ufund-ui/src/app/components/cupboard/cupboard.component.ts # ufund-ui/src/app/components/funding-basket/funding-basket.component.html # ufund-ui/src/app/components/funding-basket/funding-basket.component.ts # ufund-ui/src/app/components/need-list/need-list.component.html # ufund-ui/src/app/components/need-list/need-list.component.ts # ufund-ui/src/app/components/need-page/need-page.component.html
\| \| * \|	Fix many bugs and code clean up	sowgro	2025-04-04
\| \| \| \|
\| \| * \|	Improve add to basket feedback	sowgro	2025-04-04
\| \| \| \|
\| \| * \|	Implemented action buttons with ng-template!!!	sowgro	2025-04-03
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'origin/need-list-abstraction' into ↵	sowgro	2025-04-03
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	need-list-abstraction # Conflicts: # ufund-ui/src/app/components/cupboard/cupboard.component.html # ufund-ui/src/app/components/cupboard/cupboard.component.ts # ufund-ui/src/app/components/funding-basket/funding-basket.component.html # ufund-ui/src/app/components/need-list/need-list.component.ts
\| \| \| * \|	[incomplete] rearrange code to begin need-list abstraction	sowgro	2025-04-02
\| \| \| \| \|
\| \| * \| \|	get checkout abstraction kinda working	sowgro	2025-04-03
\| \| \|/ /
\| * \| /	Added running total to checkout	Gunther6070	2025-04-05
\| \| \|/ \| \|/\|
\| * \|	Made every invalid need input in basket turn red when invalid	Gunther6070	2025-04-04
\| \| \|
\| * \|	Fixed incognito race condition and checkout bugs	Gunther6070	2025-04-03
\| \| \|
\| * \|	Changes to cupboard on front end and back end to try and fix bugs	Gunther6070	2025-04-03
\| \| \|
\| * \|	[incomplete] checkout flow improvement	sowgro	2025-04-02
\| \|/
* /	finish styling basket and list; add persistent theme via localStorage. -ak	Akash Keshav	2025-04-05
\|/
*	Signup logs you in and brings you to home page now. Also modified toasts in ↵	Gunther6070	2025-04-02
\| \| \| \|	funding basket
*	Get everything working enough to go in main	sowgro	2025-04-01
\|
*	More css cleanup	sowgro	2025-04-01
\|
*	Commit half working changes to move to my laptop	sowgro	2025-03-31
\|
*	Tweak validation in funding basket	sowgro	2025-03-31
\|
*	Merge remote-tracking branch 'origin/css' into css	sowgro	2025-03-31
\|\
\| *	Updated toast's types	Gunther6070	2025-03-31
\| \|
* \|	Apply css to funding basket	sowgro	2025-03-31
\|/
*	use toasts in funding basket	sowgro	2025-03-31
\|
*	Removed login check for now	Gunther6070	2025-03-31
\|
*	Added check to prevent redirect to login page	Gunther6070	2025-03-31
\|
*	Make frontend work with the new backend checkout system	sowgro	2025-03-26
\|
*	cleaned up outputs. -ak	Akash Keshav	2025-03-18
\|
*	fixed odd rounding errors in funding basket. -ak	Akash Keshav	2025-03-18
\|
*	idk but it works. funding basket worsk. -ak	Akash Keshav	2025-03-18
\|
*	working update need; broken remove basket. -ak	Akash Keshav	2025-03-18
\|
*	debug of checkout. -ak	Akash Keshav	2025-03-18
\|
*	Added basic css to funding basket needs	Gunther6070	2025-03-18
\|
*	added descriptions to funding basket. -ak	Akash Keshav	2025-03-18
\|
*	connected backend to frontend for funding basket. -ak	Akash Keshav	2025-03-18
\|
*	reworked funding basket to accept need-list component. -ak	Akash Keshav	2025-03-18
\|
*	Commented out bugged lines	Gunther6070	2025-03-18
\|
*	push changes so far	sowgro	2025-03-18
\|
*	fixing errors in funding basket	benal01	2025-03-17
\|
*	needs called onInit	benal01	2025-03-17
\|\