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

	Commit message (Collapse)	Author	Age
...
\| \| * \| \|	Merge branch 'main' into need-image	sowgro	2025-04-05
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # ufund-ui/src/app/components/need-list/need-list.component.ts # ufund-ui/src/app/components/need-page/need-page.component.html
\| \| * \| \|	Merge branch 'main' into need-image	sowgro	2025-04-05
\| \| \|\ \ \
\| \| * \| \| \|	need image gradient fix	benal01	2025-04-05
\| \| \| \| \| \|
\| \| * \| \| \|	need items per page persistence	benal01	2025-04-05
\| \| \| \| \| \|
\| \| * \| \| \|	localstorage for page (keeps current page on refresh/back arrow)	benal01	2025-04-04
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'need-image' of ↵	benal01	2025-04-03
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \|	https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions into need-image
\| \| * \| \| \|	need-page's transparent image in background	benal01	2025-04-03
\| \| \| \| \| \|
* \| \| \| \| \|	Updated dashboard styling	Gunther6070	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
\| \| \| \| \|
\| * \| \| \|	Remove old auth redirect code	sowgro	2025-04-04
\| \| \| \| \|
\| * \| \| \|	fix missing location label	sowgro	2025-04-04
\| \| \| \| \|
\| * \| \| \|	Add sort by type	sowgro	2025-04-04
\| \| \| \| \|
\| * \| \| \|	Add new authentication to dashboard, cleanup	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 button alignment on chrome	sowgro	2025-04-04
\| \| \| \| \|
\| * \| \| \|	Fix many bugs and code clean up	sowgro	2025-04-04
\| \| \| \| \|
\| * \| \| \|	Fix create-need dialog	sowgro	2025-04-04
\| \| \| \| \|
\| * \| \| \|	Fix modal z-index	sowgro	2025-04-04
\| \| \| \| \|
\| * \| \| \|	Fix home screen being too short	sowgro	2025-04-04
\| \| \| \| \|
\| * \| \| \|	Edit modal	sowgro	2025-04-04
\| \| \| \| \|
\| * \| \| \|	Improve toast	sowgro	2025-04-04
\| \| \| \| \|
\| * \| \| \|	Improve add to basket feedback	sowgro	2025-04-04
\| \| \| \| \|
\| * \| \| \|	code cleanup	sowgro	2025-04-03
\| \| \| \| \|
\| * \| \| \|	Implemented action buttons with ng-template!!!	sowgro	2025-04-03
\| \| \| \| \|
\| * \| \| \|	abstraction working with search and sort	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
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #28 from RIT-SWEN-261-02/css	Hayden Hartman	2025-04-04
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	css-merge
\| * \| \|	Made every invalid need input in basket turn red when invalid	Gunther6070	2025-04-04
\| \| \| \|
\| * \| \|	Merge pull request #26 from RIT-SWEN-261-02/checkout-improvement	Hayden Hartman	2025-04-04
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Checkout improvement
\| \| * \| \|	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
\| \| \|/ /
\| * \| \|	Added fulfilled needs list dashboard	Gunther6070	2025-04-03
\| \| \| \|
\| * \| \|	Updated styling on signup page	Gunther6070	2025-04-03
\| \| \| \|
\| * \| \|	Updated statistics on dashboard	Gunther6070	2025-04-03
\| \| \| \|
\| * \| \|	Added dashboard statistics	Gunther6070	2025-04-03
\| \| \| \|
* \| \| \|	Merge branch 'main' into need-image	benal01	2025-04-02
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	dollar label in need page	benal01	2025-04-02
\| \| \| \|
\| * \| \|	dollar label for monetary needs	benal01	2025-04-02
\| \| \| \|
\| * \| \|	negative and large input handling for need page amount	benal01	2025-04-02
\| \| \| \|
* \| \| \|	ngIf for image instead of placeholder	benal01	2025-04-02
\| \| \| \|
* \| \| \|	images for current cupboard and image cropping	benal01	2025-04-02
\| \| \| \|
* \| \| \|	need image support in need page	benal01	2025-04-02
\| \| \| \|
* \| \| \|	placeholder for unset need images	benal01	2025-04-02
\| \|/ / \|/\| \|
* \| \|	Added dollar signs and other small additions to needs	Gunther6070	2025-04-02
\| \| \|
* \| \|	Added dollar signs and other small additions to needs	Gunther6070	2025-04-02
\| \|/ \|/\|