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

Todo list UI and description model #113

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

Todo list UI and description model #113

wants to merge 89 commits into from

Conversation

WoodySIN
Copy link

No description provided.

WoodySIN and others added 30 commits March 6, 2018 02:09
@WoodySIN
updated url in DeveloperGuide.adoc and UserGuide.adoc
95652e7 
It is to match our fork in Organisation CS2103JAN2018-F09-B1
@Alaru
Add backup method to AddressBookStorage Interface
d110f90
@Alaru
Add backup methods to save the addressbook in a separate backup file
183640a
@WoodySIN
update on the repo name from addressbook level 4 to main
39c7ae3
@WoodySIN
Merge pull request #1 from WoodySIN/master
6c5c343 
update URI from addressbook to main
@JoonKai1995
Change tag colours to blue (test not edited yet)
3ee33e4 
Add more words and definitions to DGs glossary
@Pearlissa
add listTags() function in model,
81fe21e 
update developer's guide (user profile, value proposition and user stories)
@WoodySIN
update some NFRs on DG
e80fd08
@Alaru
Put overloaded methods together
ad37beb
@WoodySIN
update on the coverall badge
2ad122f
@WoodySIN
Merge pull request #4 from WoodySIN/master
648e2d3 
update some NFRs on DG
@Alaru
Add some Use Cases to DeveloperGuide.adoc
3d12ff8
@WoodySIN
implement alias for commands -- add, clear, delete, edit, find, help,…
5c24d03 
… history, list, redo, undo and select
@Pearlissa
add listTags() function in model,
11fb268 
update developer's guide (user profile, value proposition and user stories)
@Pearlissa
add listTags() function in model,
1908e94 
update developer's guide (user profile, value proposition and user stories)
@JoonKai1995
Add newline at EOF for DarkTheme.css
0fc3092
@WoodySIN
Merge pull request #5 from Alaru/StorageEnhancement
4b4036b 
Add backup file for Addressbook
@WoodySIN
Merge pull request #6 from Alaru/UseCases
5ac3ed9 
Update Use Cases in Developer Guide
@WoodySIN
Merge pull request #7 from WoodySIN/master
4791281 
implement alias for commands
@JoonKai1995
Adjusted indents
de190ac
@WoodySIN
update team name and product name on UGDG
5096d46
@JoonKai1995
Adjusted indents
566890a
@JoonKai1995
Adjusted indents
bf7d1c2
@WoodySIN
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
ba44dcf
@Pearlissa
add listTags() enhancement
6007bd4
@Pearlissa
update developer's guide (user profile, value proposition and user st…
bb00f77 
…ories)
@JoonKai1995
Only DeveloperGuide
eae6ce4
@Pearlissa
update developer's guide (user profile, value proposition and user st…
d525474 
…ories)
@WoodySIN
Merge pull request #12 from Pearlissa/developer's_guide
af7edbe 
update developer's guide
@WoodySIN
Merge pull request #11 from WoodySIN/master
fa771b2 
update team name and product name on UGDG
Pearlissa and others added 25 commits March 16, 2018 00:46
@Pearlissa
Added profile picture for about us documentation
4e62ce3
@Alaru
Update coding style of EmailCommandTest
65d98cc
@Alaru
Merge pull request #19 from JoonKai1995/UserGuide1.1
81667a5 
Update Documentation
@JoonKai1995
Added Daniel picture
e78cbe9
@Pearlissa
set some default tag colours
0b259e6
@Alaru
Merge branch 'master' into v1.1AboutUs
be4cf39
@Alaru
Update description of EmailCommandTest
1fe7fb2
@WoodySIN
Added Junit test for import command
8eab749
@WoodySIN
fix a conflict
527a959
@WoodySIN
Merge branch 'master' into ImportCommand
e262808
@WoodySIN
remove extra import
639f894
@WoodySIN
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main …
e522277 
…into ImportCommand

# Conflicts:
#	docs/UserGuide.adoc
@WoodySIN
no message
b6d2da6
@WoodySIN
Merge branch 'ImportCommand' of https://github.com/WoodySIN/main into…
f73f219 
… ImportCommand
@WoodySIN
fix unused import in typicalimportFile
796af6a
@WoodySIN
Merge pull request #23 from Pearlissa/About_Us_profile
40ef7c4 
About_Us_profile
@WoodySIN
Merge pull request #22 from Alaru/v1.1AboutUs
21f0253 
V1.1 - Update AboutUs.adoc
@WoodySIN
Merge pull request #18 from JoonKai1995/MatriculationNumber
5d053b5 
Implement Matriculation Number
@WoodySIN
Merge branch 'master' into EmailCommand
2ada6ea
@WoodySIN
Merge pull request #15 from Alaru/EmailCommand
c175e00 
Minor feature: Email Command
@WoodySIN
Merge pull request #21 from WoodySIN/ImportCommand
0f83708 
added ImportCommand and its parser
@WoodySIN
Merge pull request #24 from Pearlissa/UI_defaultTagColours
9812bff 
UI_defaultTagColours
@Alaru
Update Feature Contribution
474ea1c
@WoodySIN
Merge pull request #26 from Alaru/Features
6808be2 
DeveloperGuide: Update Feature Contribution
@WoodySIN
added Todo List UI and the description model
c2edc84
@nus-se-pr-bot
Copy link

Hi @WoodySIN, your pull request title is invalid.

For phase A, it should be in the format of [Learning Outcome ID][Team ID] Your Name, where [Learning Outcome ID] has no dashes or spaces (e.g. [W3.1a]) and [Team ID] has one dash only and no spaces (e.g. [W14-A2] means Wednesday 2pm (14 hrs), Phase A, Team 2).

For phase B, it should be in the format of [v1.x][Team ID] Product Name, replacing v1.x with current milestone progress.

Please follow the instructions given strictly and edit your title for reprocessing.

Submit only one learning outcome per pull request (unless otherwise stated in instructions) and do remember to create your branches from the commit where the master branch is pointing at so that each PR you submit only consist of commits meant for the activity.

Note: this comment is posted by a bot. If you believe this is done in error, please create an issue at cs2103-pr-bot and add a link to this PR.

wynonaK pushed a commit to wynonaK/addressbook-level4 that referenced this pull request Mar 31, 2018
@Aquarinte
Merge pull request nus-cs2103-AY1718S2#113 from wynonaK/uniqueAppoint…
08f122a 
…ment

Appointments are unique based on datetime.
YuanQLLer pushed a commit to YuanQLLer/addressbook-level4 that referenced this pull request Apr 4, 2018
@Kyomian
Merge pull request nus-cs2103-AY1718S2#113 from karenfrilya97/master
c980110 
Sort Tasks and Events automatically upon adding
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
FormatCheckRequested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@WoodySIN @nus-se-pr-bot @Alaru @JoonKai1995 @Pearlissa