aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| * 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
| * | add alert on duplicate entryAkash Keshav2025-03-18
| | |
* | | Removed back button from dashboard and added back to the needs pageGunther60702025-03-18
| | |
* | | Added basic css to funding basket needsGunther60702025-03-18
| |/ |/|
* | Removed debugging commentsGunther60702025-03-18
| |
* | 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
| * added descriptions to funding basket. -akAkash Keshav2025-03-18
| |
* | Modified status codes to properly display error messages on creation and ↵Gunther60702025-03-18
|/ | | | updating of needs
* 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 logic on status checksGunther60702025-03-18
| |
* | connected backend to frontend for funding basket. -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
| * | Configured status messages based on responsesGunther60702025-03-18
| | |
* | | reworked funding basket to accept need-list component. -akAkash Keshav2025-03-18
| |/ |/|
* | THE UPDATE USER WORKS! -akAkash Keshav2025-03-18
|/
* Merge branch 'main' into funding_basketGunther60702025-03-18
|\
| * final edit to design doc for sprint 2. -akAkash Keshav2025-03-18
| |
| * Merge branch 'main' of ↵Akash Keshav2025-03-17
| |\ | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions
| | * Merge branch 'main' of ↵benal012025-03-17
| | |\ | | | | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions
| | * | search results status visible before they should bebenal012025-03-17
| | | |
| * | | updated design docs and updated acceptance testing spreadsheet. -akAkash Keshav2025-03-17
| | |/ | |/|
| * | updated desgin docAkash Keshav2025-03-17
| |/
| * updated error for form submissionbenal012025-03-17
| |
* | fix password bugsowgro2025-03-18
| |
* | Commented out bugged linesGunther60702025-03-18
| |
* | push changes so farsowgro2025-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
| * | hide search form on openbenal012025-03-18
| | |
* | | added log out button. -akAkash Keshav2025-03-18
|/ /
* | Merge remote-tracking branch 'origin/funding_basket' into funding_basketsowgro2025-03-18
|\ \
| * | logging error handlingbenal012025-03-18
| | |
* | | Fix problem in userServicesowgro2025-03-18
|/ /
* | add need to basketbenal012025-03-18
| |
* | fixing errors in funding basketbenal012025-03-17
| |
* | needs called onInitbenal012025-03-17
|\ \
| * | fix errors in funding basketsowgro2025-03-17
| | |
* | | implemetation of needs from API callbenal012025-03-17
| | |
* | | populate needsbenal012025-03-17
|/ /
* | Merge remote-tracking branch 'origin/funding_basket' into funding_basketsowgro2025-03-17
|\ \
| * \ Merge branch 'main' into funding_basketGunther60702025-03-17
| |\ \
* | \ \ Merge remote-tracking branch 'refs/remotes/origin/main' into funding_basketsowgro2025-03-17
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| # Conflicts: # ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
| * | Auto refresh needs on changesowgro2025-03-17
| |/
| * Added status text to update formGunther60702025-03-17
| |
| * 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
| | |
| * | Added status message when update need failsGunther60702025-03-17
| | |
| * | Merge branch 'main' of ↵Gunther60702025-03-17
| |\ \ | | | | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b