Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'main' into need-image | benal01 | 2025-04-02 |
|\ | |||
| * | dollar label in need page | benal01 | 2025-04-02 |
| | | |||
* | | ngIf for image instead of placeholder | benal01 | 2025-04-02 |
| | | |||
* | | images for current cupboard and image cropping | benal01 | 2025-04-02 |
| | | |||
* | | need image support in need page | benal01 | 2025-04-02 |
| | | |||
* | | Added dollar signs and other small additions to needs | Gunther6070 | 2025-04-02 |
| | | |||
* | | Fix warnings and misaligned prev page button | sowgro | 2025-04-01 |
|/ | |||
* | Get everything working enough to go in main | sowgro | 2025-04-01 |
| | |||
* | More css cleanup | sowgro | 2025-04-01 |
| | |||
* | Commit half working changes to move to my laptop | sowgro | 2025-03-31 |
| | |||
* | Continue working on css | sowgro | 2025-03-30 |
| | |||
* | Merge branch 'list-and-cupboard-component-refactor' into css | sowgro | 2025-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 | ||
| * | Merge remote-tracking branch 'origin/main' into ↵ | sowgro | 2025-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 | ||
| * | | API functionality for urgency and location | benal01 | 2025-03-29 |
| | | | |||
* | | | Merge branch 'main' into css | sowgro | 2025-03-27 |
|\ \ \ | | |/ | |/| | |||
| * | | Fix cupboard access checking and logging | sowgro | 2025-03-26 |
| |/ | |||
* / | Create basic home page | sowgro | 2025-03-22 |
|/ | |||
* | Removed decimal values of percents on needs | Gunther6070 | 2025-03-18 |
| | |||
* | Removed back button from dashboard and added back to the needs page | Gunther6070 | 2025-03-18 |
| | |||
* | please work, i backmerged and everything. -ak | Akash Keshav | 2025-03-17 |
| | |||
* | back button for needs and dashboard | benal01 | 2025-03-17 |
| | |||
* | Clean up project and start implementation of user sign in system | sowgro | 2025-02-26 |
| | |||
* | get angular services working | sowgro | 2025-02-26 |
| | |||
* | Start services and organize project | sowgro | 2025-02-26 |