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

Henry jk #197

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

Henry jk #197

wants to merge 631 commits into from

Conversation

HenryJk
Copy link

@HenryJk HenryJk commented Nov 12, 2018

No description provided.

spencertan96 and others added 30 commits October 30, 2018 23:54
@spencertan96
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W12-4/main
b49cba1 
# Conflicts:
#	docs/DeveloperGuide.adoc
#	src/main/java/seedu/address/logic/commands/EditCommand.java
#	src/main/java/seedu/address/logic/parser/AddressBookParser.java
#	src/main/java/seedu/address/model/person/Person.java
@spencertan96
Merge branch 'master' of https://github.com/spencertan96/main
1cb4fa4 
# Conflicts:
#	src/main/java/seedu/address/model/person/Person.java
@robertvictoreen
Merge pull request #91 from CS2103-AY1819S1-W12-4/Robert_1.3
7613dcf 
Class Statistics
@spencertan96
Fix integration
e9b4965
@spencertan96
Update Ui.png to match product
cfc1774
@spencertan96
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W12-4/main
e8906c2 
# Conflicts:
#	docs/DeveloperGuide.adoc
#	docs/diagrams/ModelComponentClassDiagram.pptx
#	docs/images/ModelClassDiagram.png
@spencertan96
Merge branch 'master' into HenryJk
03b0f9b
@spencertan96
Fix tests
d33ecf7
@spencertan96
Merge pull request #86 from CS2103-AY1819S1-W12-4/HenryJk
d4f052a 
Add EditAssignmentCommand
@spencertan96
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W12-4/main
98edb41 
# Conflicts:
#	src/main/java/seedu/address/logic/parser/AddressBookParser.java
@spencertan96
Update version number to 1.3
2e479f3
@spencertan96
Merge pull request #87 from spencertan96/master
46c1236 
Add add, delete and edit notes commands
@spencertan96
Fix resizing issues
b5f8053
@spencertan96
Fix size issues
742ec68
@spencertan96
Fix size,
bd91853 
Fix typo in UG, formatting in DG
@spencertan96
Add to UG undo/redo note
dfe765b
@zzsmao
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W12-4/main
71dc8ac
@zzsmao
no message
47938ee
@spencertan96
Fix formatting for diagrams
3b65821
@spencertan96
Add comments, clean code for Note commands
9ada45a
@robertvictoreen
Merge branch 'master' into Robert
4e27e4c 
* master: (29 commits)
  Add to UG undo/redo note
  Fix size, Fix typo in UG, formatting in DG
  Fix size issues
  Fix resizing issues
  Update version number to 1.3
  Fix tests
  Update Ui.png to match product
  Fix integration
  ClassStats code improvement
  Resize columns in MoreDetailsPanel to fix clipping, tried to resize MainWindow
  Developer Guide
  Update UG DG UML diagram
  Change note commands to accommodate undo/redo, create new Note objects
  Change display() argument in MoreDetailsPanel and PersonListPanel
  Rename empty note area in MoreDetailsPanel
  Fix zero index error for EditNote and Note command parsers
  Extract EditPersonDescriptor from EditCommand
  Add ClassStats to UserGuide
  ModelComponentClassDiagram
  Class Statistics
  ...

# Conflicts:
#	src/main/java/seedu/address/logic/commands/EditCommand.java
#	src/main/java/seedu/address/model/person/Person.java
@robertvictoreen
Attendance in EditPersonDescriptor and Person
a2c3638
@robertvictoreen
Handle Attendance in EditPersonDescriptor
6b4e08b
@robertvictoreen
Attendance in XmlAdaptedPerson
d5ee394
@robertvictoreen
PersonBuilder
ed70893
@robertvictoreen
Merge branch 'Attendance' into Robert
4386820 
* Attendance:
  no message
  Delete sandboxmanyPersons.xml

# Conflicts:
#	src/main/java/seedu/address/model/attendance/Attendance.java
#	src/main/java/seedu/address/model/attendance/AttendanceMark.java
@robertvictoreen
Javadoc comment required
2d13681
@robertvictoreen
Merge pull request #99 from CS2103-AY1819S1-W12-4/Robert
deda75c 
Merge Attendance Model
@robertvictoreen
Attendance Uid List
2b0a108
@robertvictoreen
Attendance ArrayList
ecb7d06
@nus-se-pr-bot
Copy link

Hi @HenryJk, your pull request title is invalid.

For PR sent to satisfy a learning outcome, the PR name 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-2] means Wednesday 2pm (14 hrs), Team 2).
E.g. If you are in tutorial W09 (i.e. Wednesday 9am), team 1, and is submitting a PR for LO W2.2b, the PR title would be [W2.2b][W09-1] James Yong. Note that your tutorial IDs are different from those shown in CORS/IVLE.

For team PR, the PR name should be in the format of [Team ID] Product Name (e.g. [T09-2] Contact List Pro).

Please follow the above format strictly and edit your title for reprocessing.

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

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.
6 participants
@HenryJk @nus-se-pr-bot @spencertan96 @robertvictoreen @zzsmao @Zackkh95