aboutsummaryrefslogtreecommitdiff
path: root/ufund-api (follow)
Commit message (Collapse)AuthorAge
* Merge branch 'list-and-cupboard-component-refactor' into csssowgro2025-03-30
|\ | | | | | | | | | | | | | | # Conflicts: # ufund-api/data/cupboard.json # ufund-ui/src/app/components/cupboard/cupboard.component.css # ufund-ui/src/app/components/need-list/need-list.component.css # ufund-ui/src/app/components/need-page/need-page.component.html
| * Fixed 2 broken tests in CupboardControllerTestGunther60702025-03-30
| |
| * Merge branch 'main' into list-and-cupboard-component-refactorGunther60702025-03-30
| |\ | | | | | | | | | | | | # Conflicts: # ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java
| * \ Merge remote-tracking branch 'origin/list-and-cupboard-component-refactor' ↵Gunther60702025-03-30
| |\ \ | | | | | | | | | | | | into list-and-cupboard-component-refactor
| | * | 23 new needs that adhere to the updated structurebenal012025-03-30
| | | |
| * | | Fixed broken tests and made them more consistentGunther60702025-03-30
| |/ /
| * | Merge remote-tracking branch 'origin/main' into ↵sowgro2025-03-30
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list-and-cupboard-component-refactor # Conflicts: # ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java # ufund-api/src/main/java/com/ufund/api/ufundapi/model/Need.java # ufund-ui/src/app/components/cupboard/cupboard.component.ts # ufund-ui/src/app/components/need-list/need-list.component.ts # ufund-ui/src/app/models/Need.ts
| | * \ Merge pull request #19 from RIT-SWEN-261-02/signup-pageTyler Ferrari2025-03-30
| | |\ \ | | | | | | | | | | signup-page merge
| | | * | Created signup component and implemented some functionality. Did not finish ↵Gunther60702025-03-25
| | | | | | | | | | | | | | | | | | | | implementing color bar and error messages.
| * | | | API functionality for urgency and locationbenal012025-03-29
| | | | |
| * | | | API creation bug fix- the max goal would not be casted properlybenal012025-03-22
| | | | |
| * | | | gitignorebenal012025-03-21
| | | | |
* | | | | Experimental sign up page designsowgro2025-03-30
| |_|_|/ |/| | |
* | | | Added additional tests to bring coverage up to 100# on controllersGunther60702025-03-30
| |/ / |/| |
* | | Remove crutchsowgro2025-03-27
| | |
* | | Fixed expiration and authDAO testGunther60702025-03-26
| | |
* | | fix expiration logic and cleanupsowgro2025-03-26
| | |
* | | Fix cupboard access checking and loggingsowgro2025-03-26
| |/ |/|
* | Fix tests and more cleanupsowgro2025-03-25
| |
* | Merge remote-tracking branch 'origin/api-cleanup' into api-cleanupsowgro2025-03-25
|\ \
| * \ Merge branch 'api-cleanup' of ↵Gunther60702025-03-25
| |\ \ | | | | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b into api-cleanup
| * | | Rename user getNeeds to getBasketGunther60702025-03-25
| | | |
* | | | Tweak loggingsowgro2025-03-25
| |/ / |/| |
* | | Greatly improve logging and other backend clean upsowgro2025-03-25
|/ /
* / Fixed various bugs and began fixing auth system. Also started implementing ↵Gunther60702025-03-24
|/ | | | checkout method in cupboardService
* Update test fixGunther60702025-03-18
|
* removed auth from problematic function. -akAkash Keshav2025-03-18
|
* Merge branch 'funding_basket' of ↵Akash Keshav2025-03-18
|\ | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions into funding_basket
| * Fixed importsGunther60702025-03-18
| |
| * Fixed broken testsGunther60702025-03-18
| |
| * Uncommented authentication callsGunther60702025-03-18
| |
* | cleaned up outputs. -akAkash Keshav2025-03-18
|/
* Merge branch 'funding_basket' of ↵Akash Keshav2025-03-18
|\ | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions into funding_basket
| * Merge branch 'funding_basket' of ↵Gunther60702025-03-18
| |\ | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b into funding_basket
| * | Fixed error in cupboard controller where the maxgoal was an integer and not ↵Gunther60702025-03-18
| | | | | | | | | | | | a double
* | | idk but it works. funding basket worsk. -akAkash Keshav2025-03-18
| |/ |/|
* | debug of checkout. -akAkash Keshav2025-03-18
|/
* Added missing mock to fix testsGunther60702025-03-18
|
* Fixed broken testGunther60702025-03-18
|
* Added check to getUser to remove deleted needs in basketGunther60702025-03-18
|
* Refactored removeBasketNeed methodGunther60702025-03-18
|
* Removed debugging commentsGunther60702025-03-18
|
* Modified status codes to properly display error messages on creation and ↵Gunther60702025-03-18
| | | | updating of needs
* THE UPDATE USER WORKS! -akAkash Keshav2025-03-18
|
* fix password bugsowgro2025-03-18
|
* Merge pull request #12 from RIT-SWEN-261-02/need-page-rework-reworkAkash Keshav2025-03-17
|\ | | | | Need page rework rework -> main pull request
| * please work, i backmerged and everything. -akAkash Keshav2025-03-17
| |
| * please work fixed paths?? -akAkash Keshav2025-03-17
| |
* | Merge branch 'main' of ↵Gunther60702025-03-17
|\ \ | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b
| * | fix application.properties (again)Tyler Ferrari2025-03-17
| |/