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.

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

Zhong ming saveload branch #137

Open
wants to merge 509 commits into
base: master
Choose a base branch
from

Conversation

snowbanana12345
Copy link

No description provided.

snowbanana12345 and others added 30 commits October 27, 2020 22:31
…into Zhong-ming-Branch-DataBase

# Conflicts:
#	src/main/java/seedu/dietbook/Duke.java
#	src/main/java/seedu/dietbook/database/data.txt
#	src/main/java/seedu/duke/database/data.txt
#	src/main/resources/data.txt
#	src/test/java/seedu/dietbook/food/FoodTest.java
…4/FoodList-Date-Branch

[Issue:52] FoodList: Date support
The calculator version2 brunch enables calculation of recommended calorie intake and food nutritions from food with time in a specific time range.
Some computers run the tests so quickly that LocalDateTime.now() has negligible difference in time elapsed. Relaxed upper boundary of test to LocalDateTime.MAX for robustness.
…g-ming-saveload-branch

Zhong ming saveload branch
getFoodListString StringBuilder missing "\n"
…g-ming-Branch-DataBase

Zhong ming branch data base
yuqiaoluolong and others added 30 commits November 8, 2020 23:57
…h-5-cap

Added the minimum and maximum caps for recommended calorie intake.
HengFuYuen-AboutUs.md,PPP and Developer Guide
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants