aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge pull request #30 from RIT-SWEN-261-02/need-list-imageTyler Ferrari2025-04-06
|\ \ | | | | | | Need list image and animation
| * | hover animation for need list imagebenal012025-04-05
| | |
| * | need image on need listbenal012025-04-05
| | |
* | | Merge remote-tracking branch 'origin/main'Gunther60702025-04-05
|\ \ \
| * \ \ Merge pull request #29 from RIT-SWEN-261-02/need-imageTyler Ferrari2025-04-05
| |\ \ \ | | | | | | | | | | local persistence for need list data
| | * | | Make need-page image work on all screen sizessowgro2025-04-05
| | | | |
| | * | | Fix storage after mergesowgro2025-04-05
| | | | |
| | * | | Merge branch 'main' into need-imagesowgro2025-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-imagesowgro2025-04-05
| | |\ \ \
| | * | | | need image gradient fixbenal012025-04-05
| | | | | |
| | * | | | need items per page persistencebenal012025-04-05
| | | | | |
| | * | | | localstorage for page (keeps current page on refresh/back arrow)benal012025-04-04
| | | | | |
| | * | | | Merge branch 'need-image' of ↵benal012025-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 backgroundbenal012025-04-03
| | | | | | |
* | | | | | | Updated dashboard stylingGunther60702025-04-05
|/ / / / / /
* | | | | | Merge branch 'main' into checkout-improvementGunther60702025-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
| * | | | | Merge pull request #27 from RIT-SWEN-261-02/need-list-abstractionbenal012025-04-05
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Need list abstraction
| | * | | | Fix typossowgro2025-04-04
| | | | | |
| | * | | | Remove old auth redirect codesowgro2025-04-04
| | | | | |
| | * | | | fix missing location labelsowgro2025-04-04
| | | | | |
| | * | | | Add sort by typesowgro2025-04-04
| | | | | |
| | * | | | Add new authentication to dashboard, cleanupsowgro2025-04-04
| | | | | |
| | * | | | Merge branch 'main' into need-list-abstractionsowgro2025-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 chromesowgro2025-04-04
| | | | | |
| | * | | | Fix many bugs and code clean upsowgro2025-04-04
| | | | | |
| | * | | | [backend] Add toString to need for debuggingsowgro2025-04-04
| | | | | |
| | * | | | Fix create-need dialogsowgro2025-04-04
| | | | | |
| | * | | | Fix modal z-indexsowgro2025-04-04
| | | | | |
| | * | | | Fix home screen being too shortsowgro2025-04-04
| | | | | |
| | * | | | Edit modalsowgro2025-04-04
| | | | | |
| | * | | | Improve toastsowgro2025-04-04
| | | | | |
| | * | | | Improve add to basket feedbacksowgro2025-04-04
| | | | | |
| | * | | | code cleanupsowgro2025-04-03
| | | | | |
| | * | | | Implemented action buttons with ng-template!!!sowgro2025-04-03
| | | | | |
| | * | | | abstraction working with search and sortsowgro2025-04-03
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/need-list-abstraction' into ↵sowgro2025-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 abstractionsowgro2025-04-02
| | | | | | |
| | * | | | | get checkout abstraction kinda workingsowgro2025-04-03
| | |/ / / /
* | / / / / Added running total to checkoutGunther60702025-04-05
|/ / / / /
* | | | | Merge pull request #28 from RIT-SWEN-261-02/cssHayden Hartman2025-04-04
|\ \ \ \ \ | |_|_|_|/ |/| | | | css-merge
| * | | | Made every invalid need input in basket turn red when invalidGunther60702025-04-04
| | | | |
| * | | | Merge pull request #26 from RIT-SWEN-261-02/checkout-improvementHayden Hartman2025-04-04
| |\ \ \ \ | | | | | | | | | | | | Checkout improvement
| | * | | | Fixed broken testsGunther60702025-04-03
| | | | | |
| | * | | | Fixed incognito race condition and checkout bugsGunther60702025-04-03
| | | | | |
| | * | | | Changes to cupboard on front end and back end to try and fix bugsGunther60702025-04-03
| | | | | |
| | * | | | [incomplete] checkout flow improvementsowgro2025-04-02
| | |/ / /
| * | | | Added fulfilled needs list dashboardGunther60702025-04-03
| | | | |
| * | | | Updated styling on signup pageGunther60702025-04-03
| | | | |
| * | | | Merge remote-tracking branch 'origin/css' into cssGunther60702025-04-03
| |\ \ \ \
| | * | | | Added dollar signs and other small additions to needsGunther60702025-04-03
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-16 21:21:32 +0000