Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #13 from RIT-SWEN-261-02/funding_basketv2.0 | Hayden Hartman | 2025-03-18 |
|\ | | | | | funding-basket merge | ||
| * | Merge branch 'main' into funding_basket | Gunther6070 | 2025-03-18 |
| |\ | |/ |/| | |||
* | | final edit to design doc for sprint 2. -ak | Akash Keshav | 2025-03-18 |
| | | |||
* | | Merge branch 'main' of ↵ | Akash Keshav | 2025-03-17 |
|\ \ | | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions | ||
| * \ | Merge branch 'main' of ↵ | benal01 | 2025-03-17 |
| |\ \ | | | | | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions | ||
| * | | | search results status visible before they should be | benal01 | 2025-03-17 |
| | | | | |||
* | | | | updated design docs and updated acceptance testing spreadsheet. -ak | Akash Keshav | 2025-03-17 |
| |/ / |/| | | |||
* | | | updated desgin doc | Akash Keshav | 2025-03-17 |
|/ / | |||
* | | updated error for form submission | benal01 | 2025-03-17 |
| | | |||
| * | fix password bug | sowgro | 2025-03-18 |
| | | |||
| * | Commented out bugged lines | Gunther6070 | 2025-03-18 |
| | | |||
| * | push changes so far | sowgro | 2025-03-18 |
| | | |||
| * | Merge branch 'funding_basket' of ↵ | Akash Keshav | 2025-03-18 |
| |\ | | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions into funding_basket | ||
| | * | hide search form on open | benal01 | 2025-03-18 |
| | | | |||
| * | | added log out button. -ak | Akash Keshav | 2025-03-18 |
| |/ | |||
| * | Merge remote-tracking branch 'origin/funding_basket' into funding_basket | sowgro | 2025-03-18 |
| |\ | |||
| | * | logging error handling | benal01 | 2025-03-18 |
| | | | |||
| * | | Fix problem in userService | sowgro | 2025-03-18 |
| |/ | |||
| * | add need to basket | benal01 | 2025-03-18 |
| | | |||
| * | fixing errors in funding basket | benal01 | 2025-03-17 |
| | | |||
| * | needs called onInit | benal01 | 2025-03-17 |
| |\ | |||
| | * | fix errors in funding basket | sowgro | 2025-03-17 |
| | | | |||
| * | | implemetation of needs from API call | benal01 | 2025-03-17 |
| | | | |||
| * | | populate needs | benal01 | 2025-03-17 |
| |/ | |||
| * | Merge remote-tracking branch 'origin/funding_basket' into funding_basket | sowgro | 2025-03-17 |
| |\ | |||
| | * | Merge branch 'main' into funding_basket | Gunther6070 | 2025-03-17 |
| | |\ | |||
| * | \ | Merge remote-tracking branch 'refs/remotes/origin/main' into funding_basket | sowgro | 2025-03-17 |
| |\ \ \ | |/ / / |/| / / | |/ / | | | | # Conflicts: # ufund-ui/src/app/components/funding-basket/funding-basket.component.ts | ||
* | / | Auto refresh needs on change | sowgro | 2025-03-17 |
| |/ |/| | |||
* | | Added status text to update form | Gunther6070 | 2025-03-17 |
| | | |||
* | | Merge pull request #12 from RIT-SWEN-261-02/need-page-rework-rework | Akash Keshav | 2025-03-17 |
|\ \ | | | | | | | Need page rework rework -> main pull request | ||
| * | | please work, i backmerged and everything. -ak | Akash Keshav | 2025-03-17 |
| | | | |||
| * | | please work fixed paths?? -ak | Akash Keshav | 2025-03-17 |
| | | | |||
* | | | Added status message when update need fails | Gunther6070 | 2025-03-17 |
| | | | |||
* | | | Merge branch 'main' of ↵ | Gunther6070 | 2025-03-17 |
|\ \ \ | | | | | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b | ||
| * | | | fix application.properties (again) | Tyler Ferrari | 2025-03-17 |
| |/ / | |||
* / / | Changed catch to use illegal argument exception | Gunther6070 | 2025-03-17 |
|/ / | |||
* | | Added check to update to check for less than 1 values | Gunther6070 | 2025-03-17 |
| | | |||
* | | Merge branch 'main' of ↵ | Gunther6070 | 2025-03-17 |
|\ \ | | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b | ||
| * | | back button for needs and dashboard | benal01 | 2025-03-17 |
| | | | |||
| * | | Merge branch 'main' of ↵ | benal01 | 2025-03-17 |
| |\ \ | | | | | | | | | | | | | https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions | ||
| * | | | embed element into dashboard | benal01 | 2025-03-17 |
| | | | | |||
| * | | | embed elements into dashboard | benal01 | 2025-03-17 |
| | | | | |||
* | | | | Added statusText to components to disable error messages | Gunther6070 | 2025-03-17 |
| |/ / |/| | | |||
* | | | Merge pull request #10 from RIT-SWEN-261-02/cupboard-component | Hayden Hartman | 2025-03-17 |
|\ \ \ | | | | | | | | | Cupboard component | ||
| * | | | Fix tests | sowgro | 2025-03-17 |
| | | | | |||
| * | | | Merge remote-tracking branch 'origin/cupboard-component' into cupboard-component | sowgro | 2025-03-17 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # ufund-ui/src/app/components/cupboard/cupboard.component.ts | ||
| | * | | | change id input to always use zero, the system will assign the id | benal01 | 2025-03-17 |
| | | | | | |||
| * | | | | Attempt at fixing connection to front end | sowgro | 2025-03-17 |
| |/ / / | |||
| * | | | fixed user authentication bug where user was never admin | benal01 | 2025-03-17 |
| | | | | |||
| * | | | console feedback based on user access level | benal01 | 2025-03-17 |
| | | | |