Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

US16 #116

Merged
merged 25 commits into from
Dec 6, 2023
Merged

US16 #116

merged 25 commits into from
Dec 6, 2023

Conversation

brandonrbreeze
Copy link
Collaborator

No description provided.

ujik500 and others added 25 commits December 3, 2023 20:08
@ujik500
implemented color picker
68a5bcf
@leuska
US16 all tasks complete
0ad4871
@leuska
Sorting + cleaned up a bit
1269c0c
@leuska
changes to dalle
132c940
@brandonrbreeze
fixed dalle
c941a3f
@brandonrbreeze
file structure change
e7ae07a
@yangangx
change the fidlename in db
72b73e1
@AnonymousGym
test us14
bdcdfcf
@AnonymousGym
Merge branch 'us16' of https://github.com/ucsd-cse110-fa23/cse-110-pr…
5479df1 
…oject-team-35 into us16
@ujik500
added colorpicker tests
0ff5f06
@ujik500
Merge branch 'us16' of https://github.com/ucsd-cse110-fa23/cse-110-pr…
0f614b4 
…oject-team-35 into us16
@AnonymousGym
test us15 not done
1b8a263
@AnonymousGym
Merge branch 'us16' of https://github.com/ucsd-cse110-fa23/cse-110-pr…
6c29bdc 
…oject-team-35 into us16
@ujik500
made extractMealType a static method and wrote tests for it
44660ce
@ujik500
Merge branch 'us16' of https://github.com/ucsd-cse110-fa23/cse-110-pr…
3cf2860 
…oject-team-35 into us16
@brandonrbreeze
Changes to file names
5195a75
@brandonrbreeze
Merge branch 'us16' of https://github.com/ucsd-cse110-fa23/cse-110-pr…
404daa7 
…oject-team-35 into us16
@leuska
Testing for US 14, 15, styling fix
c4726c4
@brandonrbreeze
made changes to test
0dfef5f
@brandonrbreeze
Merge branch 'us16' of https://github.com/ucsd-cse110-fa23/cse-110-pr…
a4de698 
…oject-team-35 into us16
@brandonrbreeze
changed test
4659c1a
@brandonrbreeze
Added Tests
acb3f83
@brandonrbreeze
changes to filter
d824280
@brandonrbreeze
Changed name of folders
ec67c1c
@brandonrbreeze
fixed sorting
57ef0c2
AnonymousGym
AnonymousGym approved these changes Dec 6, 2023
View reviewed changes
Copy link
Contributor

@AnonymousGym AnonymousGym left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

yangangx
yangangx approved these changes Dec 6, 2023
View reviewed changes
Copy link
Contributor

@yangangx yangangx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

ujik500
ujik500 approved these changes Dec 6, 2023
View reviewed changes
Copy link
Contributor

@ujik500 ujik500 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks all good to me and the tests are passing!

@brandonrbreeze brandonrbreeze merged commit b127915 into main Dec 6, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yangangx yangangx yangangx approved these changes

@ujik500 ujik500 ujik500 approved these changes

@AnonymousGym AnonymousGym AnonymousGym approved these changes

@leuska leuska Awaiting requested review from leuska

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@brandonrbreeze @AnonymousGym @ujik500 @yangangx @leuska