-
Notifications
You must be signed in to change notification settings - Fork 262
[CS2103T-T10-1] HealthyBaby #41
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
Open
beatricetay
wants to merge
866
commits into
nus-cs2103-AY1920S2:master
Choose a base branch
from
AY1920S2-CS2103T-T10-1:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 48 commits
Commits
Show all changes
866 commits
Select commit
Hold shift + click to select a range
5fcfa04
Debugged Cooked command
beatricetay e1fad8f
Grocery list command
beatricetay 317e49f
Cleaned up code
beatricetay 3a25fef
able to enter a single valid time ,range still has to be fixed
6d4b3a0
Updated UG
beatricetay 85b5fe3
Conformed to checkstyle
beatricetay 02fbb9a
fixed checkstyle
c1046d5
Fetched
beatricetay 0618eef
fixed time bug - time range still needs to be fixed
24c0c97
Checkstyle
beatricetay 44c220f
eof
fa7bd31
Merge pull request #174 from tharshita/bugfixes
beatricetay e2e1f48
Checkstyle
beatricetay 9e9f73d
Fetched
beatricetay 3c20ca9
EOF
beatricetay cd43068
fixed time bug
555844a
Removed unused import
beatricetay 88f7f27
Merge pull request #177 from tharshita/master
beatricetay 9072be1
Added GroceryListWindow tests for CommandResult
beatricetay 4c5ec34
Merge branch 'master' into planning-feature-plan-class
beatricetay f040161
Plan command test
beatricetay 732aedd
update tests
c13bec3
fixed check style
60a1058
eof
0f4c795
Merge pull request #176 from beatricetay/planning-feature-plan-class
tharshita 4d4f689
Created Streak class
6f4f282
Plan command test
beatricetay 0ab2152
PlanCommandParser test
beatricetay 4719111
Merge branch 'master' into planning-tests
beatricetay f8511e3
Merge branch 'master' into branch-ach
c76c961
Plan command parser test
beatricetay 37a0168
Merge pull request #178 from tharshita/master
beatricetay 57d99e3
Clear plan command test
beatricetay b2c3ad3
cleaned up code
bf5e48f
Delete plan tests
beatricetay fc47eda
fixed test cases
2191ce2
Merge pull request #180 from YuuTon9/branch-ach
beatricetay 033b747
Merge remote-tracking branch 'upstream/master'
cf326b8
Merge branch 'master' into planning-tests
beatricetay e46d831
json files
6d29491
Merge pull request #181 from tharshita/master
beatricetay 2bcca4e
Cleaned up code
beatricetay c42f3b1
Fetched
beatricetay c1cd8df
Fixed add, edit, and delete ingredient to retain fave status
pekchinsiongbrian 824605c
Debugged and added test cases
beatricetay e59e32b
Added favourite and unfavourite command tests
pekchinsiongbrian 6fdc70e
Minimised window will maximise automatically
beatricetay 15f5bfa
EOF
beatricetay 8b1b3cf
updated sample util
b73bc99
Edited error messages for various commands
pekchinsiongbrian fd9e953
Added Favourite and Unfavourite command parser tests
pekchinsiongbrian 7779228
Merge pull request #192 from beatricetay/planning-tests
pekchinsiongbrian 4f9b91c
Delete plan command tests
beatricetay 9a5f662
Defensive programming for MultipleBookStateManager
pekchinsiongbrian d38612e
Merged upstream/master
pekchinsiongbrian 16b80d5
Delete plan parser test
beatricetay 762fbd2
Grocery list tests
beatricetay a8564a4
Quantity tests
beatricetay e4a4ae0
More date tests
beatricetay 9e47fb1
Update UG
pekchinsiongbrian f370781
Updated EditCommand
pekchinsiongbrian 6056400
Update EditCommand
pekchinsiongbrian 3d7acf6
Plan test
beatricetay cb6f99c
Added planned book test
beatricetay f0c1944
Update user guide on goals + add glossary
tharshita 38af5e5
Update UserGuide.adoc
tharshita f60037a
add goals tab screenshot
tharshita 3df5d79
Added json adapted plan test
beatricetay e1533c3
Tests for Json adapted date
beatricetay 10fedb0
Added tests
beatricetay ff16130
Finalised working undo/redo
pekchinsiongbrian 67664e5
Fixed UI size
beatricetay 27d1740
Merge pull request #172 from pekchinsiongbrian/testing-jar
beatricetay 33c9892
Fixed planning list awkward length
beatricetay 603508a
Merge branch 'master' into testing-branch
pekchinsiongbrian f665d5a
removed more references to alice
beatricetay d47db99
update FAQs
tharshita c705d2b
Update UserGuide.adoc
tharshita f3acee8
Update MultipleBookStateManager.java
pekchinsiongbrian 2c2a37d
Merge pull request #193 from pekchinsiongbrian/testing-branch
pekchinsiongbrian d1755a7
Updated UI pic
beatricetay bfcd340
Checkstyle
beatricetay 0c43c19
Fetched
beatricetay d731f30
Merge branch 'master' into master
pekchinsiongbrian f34bfea
Removed trailing whitespace from UG
pekchinsiongbrian 1d888f0
Merge pull request #194 from tharshita/master
pekchinsiongbrian 3b4731a
updated list goals
698d8f5
Merge branch 'master' into planning-tests
beatricetay 36c3c8d
listgoals updated
b3e27b2
Merge pull request #195 from beatricetay/planning-tests
tharshita f3d81d7
Merge remote-tracking branch 'upstream/master'
9846ddd
Refactored isValidName
beatricetay 86f2ec7
Merge branch 'master' into planning-tests
beatricetay e2cfaa1
Name
beatricetay 972bcf3
Removed redundant lines from undo/redo command
pekchinsiongbrian 72a0127
updated help command and user docs
a7e628a
update help
e009e39
Delete goalsTab.png
tharshita 64c07d6
updated ui image for goals
tharshita 93d95f2
Delete goalsTab.png
tharshita 95774c5
update goalsTab
tharshita 5eb5e0d
Delete goalsTab.png
tharshita 3474256
update goals tab
tharshita 21721d5
Delete goalsTab.png
tharshita 488c171
Add files via upload
tharshita d682dba
uploaded screenshot
340d80a
Merge branch 'master' of https://github.com/tharshita/main
1e14cf3
eof
da30515
updated goals in sample data util
db9c0a5
Merge remote-tracking branch 'upstream/master'
8930d84
Update UserGuide.adoc
tharshita 268eeb4
Merge pull request #196 from tharshita/master
pekchinsiongbrian 851518e
Merge remote-tracking branch 'upstream/master'
pekchinsiongbrian e3ad0ec
Merge branch 'master' into planning-tests
beatricetay 71803ca
Updated coverall badge
beatricetay e5bd541
Cleaned up TODO comments
beatricetay 8e02a17
updated streak to work in tandem with cookedrecords
75587b7
Merge branch 'master' into branch-ach
bc44e43
Merge pull request #199 from beatricetay/planning-tests
pekchinsiongbrian 667e091
Merge pull request #200 from YuuTon9/branch-ach
pekchinsiongbrian 02b0159
Merge remote-tracking branch 'upstream/master'
pekchinsiongbrian 6fbf9f8
UG Diagrams
beatricetay 8447750
Updated help window
beatricetay 1d97c62
Updated help window
beatricetay 30c5f87
update ui diagram
fd95f2c
Added planning diagrams
beatricetay 4d5adf2
EOF
beatricetay 403f362
Added name
beatricetay 02c3740
Merge pull request #201 from tharshita/developerguide
beatricetay 4258646
Fetched
beatricetay 611c15b
Merge pull request #202 from beatricetay/gh-ugdg
tharshita 54908e0
Updated undo and redo section in UG
pekchinsiongbrian db7a6bb
Merged UG changes from upstream/master
pekchinsiongbrian f4bc3d0
Changed font size
beatricetay f9a2336
updated high streak score and changed fonts size
22624fd
Merge branch 'master' into branch-ach
10cf5b0
user guide updated
2ebb16b
updated command summary
e858614
Added newline at EOF
pekchinsiongbrian cb4fd07
Merge pull request #203 from YuuTon9/branch-ach
pekchinsiongbrian 472547c
Merge pull request #204 from tharshita/master
pekchinsiongbrian 65fed7e
Update DG
pekchinsiongbrian 745e86b
Merge remote-tracking branch 'upstream/master'
pekchinsiongbrian 1adbd0f
modified quotecommand and deleted StreakCommand.java
0bcc691
Merge branch 'master' into branch-ach
cca72a9
merged with master
bf25084
modified modelstub and added EOF
5e44daa
modified modelstub and added EOF
14ab5a7
Merge pull request #206 from YuuTon9/branch-ach
pekchinsiongbrian 5569af3
Updated DG
pekchinsiongbrian c3e0d90
Merge remote-tracking branch 'upstream/master'
pekchinsiongbrian 52b3dcc
Modified achievementCard and changed "High Streak" to "Highest Streak"
f609391
added eof to quotebook.json
e4454a4
added eof to all json files
636d90d
Merge pull request #207 from YuuTon9/branch-ach
pekchinsiongbrian 3a82426
Removed goals parsing from edit command and changed goal name message…
pekchinsiongbrian 8a85e04
Merge remote-tracking branch 'upstream/master'
pekchinsiongbrian e6699a2
updated storage diagram
db71098
dg
25b4f44
Merge pull request #208 from tharshita/storage
pekchinsiongbrian 2672e3b
Updated DG favourite/unfavourite command
pekchinsiongbrian fe5664d
Update DeveloperGuide.adoc
pekchinsiongbrian 298b186
Removed unnecessary imports
pekchinsiongbrian 30d8ce0
Fixed EditCommand to disallow editing of goals
pekchinsiongbrian 13877fa
Merge remote-tracking branch 'origin/master'
pekchinsiongbrian df5bec9
Merge pull request #209 from pekchinsiongbrian/master
tharshita 3efa9b5
update storage
8f83540
Model diagrams
beatricetay e374a45
fixed typo
beatricetay 26e1e5f
DG Edit sequence diagrams
beatricetay 0cd40ce
updated streak.java
3140841
Merge pull request #211 from YuuTon9/branch-ach
pekchinsiongbrian 882f5c7
Removed inheritance from MultipleBookStateManager
pekchinsiongbrian fe1d355
Merge remote-tracking branch 'upstream/master'
pekchinsiongbrian 3f985f6
Updated DG
beatricetay 23d95b1
Updated edit command of DG
beatricetay 5e183fd
Merge pull request #210 from beatricetay/gh-ugdg
pekchinsiongbrian 5a373ed
add diagram
c5ac048
Merge remote-tracking branch 'upstream/master'
24a1f1f
Edit command in DG
beatricetay d54bc0e
Updated model diagrams
beatricetay eb7723b
Merge branch 'master' into gh-ugdg
beatricetay c510bf7
updated dg on addition of goals
4acb622
Updated Model diagram of DG
beatricetay aa54745
dg
d470a48
dg
d56dc03
Updated Model Diagram
beatricetay e891c14
changes
f9e3f82
dg
606fd22
Update UserGuide.adoc
tharshita 2ba39f4
Merge pull request #3 from tharshita/tharshita-ugUpdate
tharshita 1877406
Merge pull request #212 from beatricetay/gh-ugdg
pekchinsiongbrian dba6c60
Updated undo/redo section in DG
pekchinsiongbrian 383a3cd
Merge pull request #213 from tharshita/tharshita-ugUpdate
pekchinsiongbrian 538d4c8
Merge remote-tracking branch 'upstream/master'
pekchinsiongbrian e50b3a2
added quoteactivitydiagram and quotesequencediagram
e5d9bf0
Merge remote-tracking branch 'upstream/master' into branch-ach
a834b48
Update UserGuide.adoc
tharshita 608c9fd
dg update
b571a6d
Merge branch 'master' of https://github.com/tharshita/main
7e5bb87
Merge remote-tracking branch 'upstream/master'
4150b28
made corrections to diagrams
beatricetay bf7e330
Shifted annotation
beatricetay 2471402
Merge remote-tracking branch 'upstream/master' into branch-ach
ad4d8b7
Modified DG and UG
399989d
Updated DG and fixed broken test
pekchinsiongbrian 9a7c2fe
Merge pull request #215 from YuuTon9/branch-ach
tharshita fe0310e
Merge pull request #216 from pekchinsiongbrian/master
tharshita 7183f3d
dg update
e659625
Merge remote-tracking branch 'upstream/master'
546d4c5
Packaged fxml files
beatricetay fbed776
eof
0b99dbb
dg
abdc617
Cleaned up DG Appendix
beatricetay 71e321c
Merge pull request #217 from tharshita/master
beatricetay 9b702b5
Modified QuoteCommand and QuoteCommandTest and included image files
ceda4fe
Updated UG
beatricetay e2c9643
Updated UG
beatricetay 2d5591e
Updated UGDG and PPP
pekchinsiongbrian 00067df
Merge pull request #218 from YuuTon9/branch-ach
pekchinsiongbrian 6b7f393
Merge pull request #219 from pekchinsiongbrian/master
pekchinsiongbrian 19f6670
Added tags, finalised PPP
beatricetay 269a776
Merge branch 'master' into gh-ugdg
beatricetay 32f8bbf
EOF
beatricetay cb4e920
Merge pull request #220 from beatricetay/gh-ugdg
beatricetay a0d36ff
modified PPP and AchievementCard
0f84e34
Enhanced undo/redo to be compatible with quote command
pekchinsiongbrian 0a21da1
Updated undo/redo portions to reflect compatibility with quote command
pekchinsiongbrian 975de5c
Updated DG to reflect 4 books for undo/redo
pekchinsiongbrian 453e0ff
Merge pull request #221 from pekchinsiongbrian/enhance-undoredo
YuuTon9 0257da1
modified PPP, DG, AchievementCard and added tags
8a975b7
Merge remote-tracking branch 'upstream/master' into branch-ach
3cdffae
Merge pull request #222 from YuuTon9/branch-ach
pekchinsiongbrian 8b4d3a2
Updated DG diagrams
beatricetay 2b05f39
Shifted text in diagram
beatricetay 4497f6e
Merge branch 'master' into gh-ugdg
beatricetay 8da66a3
Replaced references to address
beatricetay f0c03a3
Minor changes to strings
beatricetay b446e35
import
beatricetay c00d5d2
dg
beatricetay 9981682
fixed
beatricetay e1f989d
EOF
beatricetay 5aa6ab4
Update DeveloperGuide.adoc
tharshita e917eb4
Updated DG
pekchinsiongbrian 1aac3f4
Update DeveloperGuide.adoc
tharshita a8382fa
Merge pull request #223 from beatricetay/gh-ugdg
beatricetay e694ce9
Merge pull request #224 from pekchinsiongbrian/master
pekchinsiongbrian 77c97de
update ppp
tharshita 709a6d3
Update DeveloperGuide.adoc
tharshita 6ac8bcb
Update DeveloperGuide.adoc
tharshita File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,10 @@ | |
| :site-section: ContactUs | ||
| :stylesDir: stylesheets | ||
|
|
||
| * *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve. | ||
| * *Bug reports, Suggestions* : Post in our https://github.com/AY1920S2-CS2103T-T10-1/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve. | ||
| * *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here] | ||
| * *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg` | ||
| * *Email us* : You can also reach us at the following emails: | ||
| ** Harshita: `[email protected]` | ||
| ** Yue Tong: `[email protected]` | ||
| ** Beatrice: `[email protected]` | ||
| ** Brian: `[email protected]` | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.