aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | * | fix application.properties (again)Tyler Ferrari2025-03-17
| | |/
| * / Changed catch to use illegal argument exceptionGunther60702025-03-17
| |/
| * Added check to update to check for less than 1 valuesGunther60702025-03-17
| |
| * Merge branch 'main' of ↵Gunther60702025-03-17
| |\ | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b
| | * back button for needs and dashboardbenal012025-03-17
| | |
| | * Merge branch 'main' of ↵benal012025-03-17
| | |\ | | | | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions
| | * | embed element into dashboardbenal012025-03-17
| | | |
| | * | embed elements into dashboardbenal012025-03-17
| | | |
| * | | Added statusText to components to disable error messagesGunther60702025-03-17
| | |/ | |/|
| * | Merge pull request #10 from RIT-SWEN-261-02/cupboard-componentHayden Hartman2025-03-17
| |\ \ | | | | | | | | Cupboard component
| | * | Fix testssowgro2025-03-17
| | | |
| | * | Merge remote-tracking branch 'origin/cupboard-component' into cupboard-componentsowgro2025-03-17
| | |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # ufund-ui/src/app/components/cupboard/cupboard.component.ts
| | | * | change id input to always use zero, the system will assign the idbenal012025-03-17
| | | | |
| | * | | Attempt at fixing connection to front endsowgro2025-03-17
| | |/ /
| | * | fixed user authentication bug where user was never adminbenal012025-03-17
| | | |
| | * | console feedback based on user access levelbenal012025-03-17
| | | |
| | * | hide admin only management elements if user is not an adminbenal012025-03-17
| | | |