alu/cse110-fa22-group29
1
0
Fork 0
mirror of https://github.com/cse110-fa22-group29/cse110-fa22-group29.git synced 2026-08-28 13:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
443 Commits 4 Branches 1 Tag
18a3230ad745b9fcda203e39606d6085b5d6607f
Commit Graph
46 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanjit Joseph 18a3230ad7 Merge branch 'filter-sort' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into filter-sort 2022-11-30 17:12:36 -08:00
Sanjit Joseph 1347e3bbc1 Implement new create button 2022-11-30 17:11:57 -08:00
Sanjit Joseph 7b8fea9d67 Upload new create button 2022-11-30 17:11:39 -08:00
Sanjit Joseph de1ec502b1 Fix default image cropping issues + add caption 2022-11-23 18:04:09 -08:00
Sanjit Joseph 4832726b14 Update E2E tests to check for new default image 2022-11-23 17:22:23 -08:00
Sanjit Joseph 0b7e101bb2 Select default_plate image when no food image uploaded 2022-11-23 17:20:55 -08:00
Sanjit JosephandGitHub 3ebefac2db Delete statusvideo1.mp4 
Fixing commit message shenanigans
 2022-11-22 21:44:03 -08:00
Sanjit JosephandGitHub a9bf42a849 Merge pull request #88 from sm-joseph/main 
Upload status video 1
 2022-11-22 21:38:41 -08:00
Sanjit JosephandGitHub 1017bd48a2 Merge pull request #87 from sm-joseph/main 
Fix commit message linking to unwanted pr
 2022-11-22 21:26:55 -08:00
Sanjit JosephandGitHub 3131391d92 Merge branch 'cse110-fa22-group29:main' into main 2022-11-22 21:24:25 -08:00
Sanjit JosephandGitHub c7d2a5434d Merge pull request #86 from sm-joseph/main 
Upload status video #1
 2022-11-22 21:11:53 -08:00
Sanjit JosephandGitHub 4eaa1f38bb Merge pull request #65 from cse110-fa22-group29/sprint-2-star-rating 
Sprint 2 star rating
 2022-11-17 12:53:41 -08:00
Sanjit Joseph 004e5cc2a2 Attempt CSS linting fix - v2 2022-11-17 12:44:19 -08:00
Sanjit Joseph f9074a2bc6 Attempt CSS linting fix 2022-11-17 12:31:51 -08:00
Sanjit Joseph 85dc0544c7 Add star rating system to main page 2022-11-17 12:19:26 -08:00
Sanjit JosephandGitHub b26e12da76 Merge pull request #30 from sm-joseph/main 
11/01/22 Meeting minutes
 2022-11-01 20:58:50 -07:00
Sanjit JosephandGitHub 030c9b3c30 Merge branch 'cse110-fa22-group29:main' into main 2022-11-01 20:55:55 -07:00
Sanjit JosephandGitHub 58edc173d2 Update 110122-meeting.md 2022-11-01 20:52:02 -07:00
Sanjit JosephandGitHub beec368bad Merge pull request #29 from sm-joseph/main 
11/01/22 Meeting update
 2022-11-01 20:44:30 -07:00
Sanjit JosephandGitHub e0bbe3d472 Update pitch.md with new wireframe images 2022-11-01 20:43:28 -07:00
Sanjit JosephandGitHub 828ee6444d Merge branch 'cse110-fa22-group29:main' into main 2022-11-01 20:38:37 -07:00
Sanjit JosephandGitHub 74b12b7b24 Create 110122-meeting.md 2022-11-01 19:09:22 -07:00
Sanjit JosephandGitHub c5fe5c010a Merge pull request #28 from sm-joseph/main 
Project pitch meeting notes
 2022-10-28 17:27:33 -07:00
Sanjit JosephandGitHub 076f633358 Update 102822-project_pitch.md 2022-10-28 17:26:58 -07:00
Sanjit JosephandGitHub f4308d3554 Create 102822-project_pitch.md 2022-10-28 17:26:01 -07:00
Sanjit JosephandGitHub 42855c2635 Merge pull request #27 from sm-joseph/main 
Added some images to pitch
 2022-10-28 14:58:02 -07:00
Sanjit JosephandGitHub 0c13e36067 Update images on pitch.md 2022-10-28 14:57:17 -07:00
Sanjit JosephandGitHub b988c19799 Add basic sketch for new entry visual 2022-10-28 14:54:37 -07:00
Sanjit JosephandGitHub 6362bc43d4 Merge pull request #26 from sm-joseph/main 
Meeting notes for 10/27/22
 2022-10-27 18:14:51 -07:00
Sanjit JosephandGitHub 6b62ade50e Update 102722-final_decision.md 2022-10-27 18:12:30 -07:00
Sanjit JosephandGitHub 4b8d202cc6 Update 102722-final_decision.md 2022-10-27 18:11:57 -07:00
Sanjit JosephandGitHub d9a10ee6b3 Create 102722-final_decision.md 2022-10-27 17:50:56 -07:00
Sanjit JosephandGitHub aa3476cddd Update 102622-checkin3.md 2022-10-27 17:14:11 -07:00
Sanjit JosephandGitHub 66d321c927 Update 102622-checkin3.md 2022-10-27 17:13:45 -07:00
Sanjit JosephandGitHub 5047c01c2a Merge pull request #25 from sm-joseph/main 
Upload 10/26/22 Meeting Minutes
 2022-10-26 16:34:07 -07:00
Sanjit JosephandGitHub fcf2eb44a1 Create 102622-checkin3.md 2022-10-26 16:32:29 -07:00
Sanjit JosephandGitHub 694bbc3a02 Merge pull request #19 from sm-joseph/main 
embed poster in team.md
 2022-10-16 18:11:15 -07:00
Sanjit JosephandGitHub 7d88b28c25 Merge branch 'cse110-fa22-group29:main' into main 2022-10-16 18:09:16 -07:00
Sanjit JosephandGitHub 3642b60f36 Merge pull request #18 from sm-joseph/main 
uploaded team poster
 2022-10-16 18:00:44 -07:00
Sanjit JosephandGitHub 1154fffcae Merge branch 'cse110-fa22-group29:main' into main 2022-10-16 17:59:36 -07:00
Sanjit JosephandGitHub add6345679 Merge pull request #17 from sm-joseph/main 
Updated logo with team number & updated team colors
 2022-10-16 16:49:05 -07:00
Sanjit JosephandGitHub d22303fd41 Merge pull request #16 from sm-joseph/main 
Update branding folder
 2022-10-16 15:54:20 -07:00
Sanjit JosephandGitHub 273c5bff92 Delete empty branding.txt file 2022-10-16 15:50:53 -07:00
Sanjit JosephandGitHub 5831b88bb5 Add team logo 2022-10-16 15:50:19 -07:00
Sanjit JosephandGitHub 41c2f286e0 Sanjit - added profile description 2022-10-14 19:21:48 -07:00
Sanjit JosephandGitHub 7c92bd9db0 Add rules - Sanjit 2022-10-14 18:23:34 -07:00