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

[CS2103T-T17-1] My Projects #125

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

Conversation

ccyccyccy
Copy link

No description provided.

ccyccyccy and others added 30 commits November 11, 2019 14:04
* WIP

* Change add timetable to set timetable

* Add UG DG to PPP

* Fix adoc

* Fix small bug
* add basic finance tracker functionality

* implement graph for finance

* fixed checkstyle

* fix no newline at EOF

* changed data to docs

* implement back feature

* fixed no newline at EOF

* fixed back feature bug

* updated ug/dg

* fix checkstyle

* fixed some bugs

* fix checkstyle

* implement excel

* fix checkstyle

* small fixes

* wtf is happening

* fixed navigating of UiDisplay

* updat dg

* fix checkstyle
* Modified the Meeting feature to follow the member's and task's format

* Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/main/java/seedu/address/logic/commands/AddProjectCommand.java
#	src/main/java/seedu/address/logic/commands/AddProjectMeetingCommand.java

* Fixed Meetings Display in Project Overview

* Corrected Validation Regex for date and time

* Implemented sendReminder Command for Mailing

* Corrected JsonAdaptedMeeting

* Improving code readability and added MeetingClassDiagram and ProjectMeeting.png

* no message

* Added sequence diagram for SendReminderCommand

* Added SequenceDiagram and ActivityDiagram for SendReminder

* checkstyle for SendreminderActivityDiagram.puml

* Fixed bugs for sendReminder command

* Corrected SendReminderSequenceDiagram and sendreminderActivityDiagram

* Improve error message LOL

* Travis try pass

* Update DeveloperGuide.adoc (#2)

* philipalexanderb PPP

* Updated userguide and developerguide

* MeetingClassDiagram change

* Update documentation

* Documentation and error handlding for sendMail upgrade

* Documentation update

* Added Test classes adn updated documentation

* Amended test classes

* Travis passing addProjectCommandTest class

* Remove one test cases from addProjectMeetingCommandTest java

* Travis check for AddProjectMeetingCommandTest

* Documentation update

* Fixed bugs
* Updated UG

* Updated adocs

* updated UG

* sorted member tag in project card

* checkstyle

* edited some errors

* solved some bugs from pe dry run

* edited some bugs

* resolve checkstyle

* added 1 part for dg

* dg update

* philips burden

* philips burden

* edited some UG

* edit ug

* solved checkstyle

* solve checkstyle

* added activity diagram

* checkstyle

* formatted ug

* no message

* Before adding sortMeeting

* added sort Meeting command

* checkstyle

* added ppp

* checkstyle

* edited ppp and ug/dg

* updated home page image

* travis

* added tests

* dg

* updated ppp

* added logging

* deleted excel sheet

* update ug

* edited some bugs
* Modified the Meeting feature to follow the member's and task's format

* Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/main/java/seedu/address/logic/commands/AddProjectCommand.java
#	src/main/java/seedu/address/logic/commands/AddProjectMeetingCommand.java

* Fixed Meetings Display in Project Overview

* Corrected Validation Regex for date and time

* Implemented sendReminder Command for Mailing

* Corrected JsonAdaptedMeeting

* Improving code readability and added MeetingClassDiagram and ProjectMeeting.png

* no message

* Added sequence diagram for SendReminderCommand

* Added SequenceDiagram and ActivityDiagram for SendReminder

* checkstyle for SendreminderActivityDiagram.puml

* Fixed bugs for sendReminder command

* Corrected SendReminderSequenceDiagram and sendreminderActivityDiagram

* Improve error message LOL

* Travis try pass

* Update DeveloperGuide.adoc (#2)

* philipalexanderb PPP

* Updated userguide and developerguide

* MeetingClassDiagram change

* Update documentation

* Documentation and error handlding for sendMail upgrade

* Documentation update

* Added Test classes adn updated documentation

* Amended test classes

* Travis passing addProjectCommandTest class

* Remove one test cases from addProjectMeetingCommandTest java

* Travis check for AddProjectMeetingCommandTest

* Documentation update

* Fixed bugs

* Fixed meeting error message

* Documentation update
* Include DG in PPP

* Update UG
* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message
* Modified the Meeting feature to follow the member's and task's format

* Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/main/java/seedu/address/logic/commands/AddProjectCommand.java
#	src/main/java/seedu/address/logic/commands/AddProjectMeetingCommand.java

* Fixed Meetings Display in Project Overview

* Corrected Validation Regex for date and time

* Implemented sendReminder Command for Mailing

* Corrected JsonAdaptedMeeting

* Improving code readability and added MeetingClassDiagram and ProjectMeeting.png

* no message

* Added sequence diagram for SendReminderCommand

* Added SequenceDiagram and ActivityDiagram for SendReminder

* checkstyle for SendreminderActivityDiagram.puml

* Fixed bugs for sendReminder command

* Corrected SendReminderSequenceDiagram and sendreminderActivityDiagram

* Improve error message LOL

* Travis try pass

* Update DeveloperGuide.adoc (#2)

* philipalexanderb PPP

* Updated userguide and developerguide

* MeetingClassDiagram change

* Update documentation

* Documentation and error handlding for sendMail upgrade

* Documentation update

* Added Test classes adn updated documentation

* Amended test classes

* Travis passing addProjectCommandTest class

* Remove one test cases from addProjectMeetingCommandTest java

* Travis check for AddProjectMeetingCommandTest

* Documentation update

* Fixed bugs

* Fixed meeting error message

* Documentation update

* Update documentations
* Final PPP

* Edit PPP
* Invalid time range correctly prompted

* Small change

* Edit PPP abit

* Delete commneted out test cases

* Fix checkstyle
* Updated UG

* Updated adocs

* updated UG

* sorted member tag in project card

* checkstyle

* edited some errors

* solved some bugs from pe dry run

* edited some bugs

* resolve checkstyle

* added 1 part for dg

* dg update

* philips burden

* philips burden

* edited some UG

* edit ug

* solved checkstyle

* solve checkstyle

* added activity diagram

* checkstyle

* formatted ug

* no message

* Before adding sortMeeting

* added sort Meeting command

* checkstyle

* added ppp

* checkstyle

* edited ppp and ug/dg

* updated home page image

* travis

* added tests

* dg

* updated ppp

* added logging

* deleted excel sheet

* update ug

* edited some bugs

* final ppp update

* edited bugs
* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message
* Modified the Meeting feature to follow the member's and task's format

* Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/main/java/seedu/address/logic/commands/AddProjectCommand.java
#	src/main/java/seedu/address/logic/commands/AddProjectMeetingCommand.java

* Fixed Meetings Display in Project Overview

* Corrected Validation Regex for date and time

* Implemented sendReminder Command for Mailing

* Corrected JsonAdaptedMeeting

* Improving code readability and added MeetingClassDiagram and ProjectMeeting.png

* no message

* Added sequence diagram for SendReminderCommand

* Added SequenceDiagram and ActivityDiagram for SendReminder

* checkstyle for SendreminderActivityDiagram.puml

* Fixed bugs for sendReminder command

* Corrected SendReminderSequenceDiagram and sendreminderActivityDiagram

* Improve error message LOL

* Travis try pass

* Update DeveloperGuide.adoc (#2)

* philipalexanderb PPP

* Updated userguide and developerguide

* MeetingClassDiagram change

* Update documentation

* Documentation and error handlding for sendMail upgrade

* Documentation update

* Added Test classes adn updated documentation

* Amended test classes

* Travis passing addProjectCommandTest class

* Remove one test cases from addProjectMeetingCommandTest java

* Travis check for AddProjectMeetingCommandTest

* Documentation update

* Fixed bugs

* Fixed meeting error message

* Documentation update

* Update documentations

* Documentation update
* add basic finance tracker functionality

* implement graph for finance

* fixed checkstyle

* fix no newline at EOF

* changed data to docs

* implement back feature

* fixed no newline at EOF

* fixed back feature bug

* updated ug/dg

* fix checkstyle

* fixed some bugs

* fix checkstyle

* implement excel

* fix checkstyle

* small fixes

* wtf is happening

* fixed navigating of UiDisplay

* updat dg

* fix checkstyle

* final commit

* final final commit
…ddFromContacts and assignTask also fixed editing person when person in project crashing application (#239)

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message
…242)

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message

* no message
* Modified the Meeting feature to follow the member's and task's format

* Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/main/java/seedu/address/logic/commands/AddProjectCommand.java
#	src/main/java/seedu/address/logic/commands/AddProjectMeetingCommand.java

* Fixed Meetings Display in Project Overview

* Corrected Validation Regex for date and time

* Implemented sendReminder Command for Mailing

* Corrected JsonAdaptedMeeting

* Improving code readability and added MeetingClassDiagram and ProjectMeeting.png

* no message

* Added sequence diagram for SendReminderCommand

* Added SequenceDiagram and ActivityDiagram for SendReminder

* checkstyle for SendreminderActivityDiagram.puml

* Fixed bugs for sendReminder command

* Corrected SendReminderSequenceDiagram and sendreminderActivityDiagram

* Improve error message LOL

* Travis try pass

* Update DeveloperGuide.adoc (#2)

* philipalexanderb PPP

* Updated userguide and developerguide

* MeetingClassDiagram change

* Update documentation

* Documentation and error handlding for sendMail upgrade

* Documentation update

* Added Test classes adn updated documentation

* Amended test classes

* Travis passing addProjectCommandTest class

* Remove one test cases from addProjectMeetingCommandTest java

* Travis check for AddProjectMeetingCommandTest

* Documentation update

* Fixed bugs

* Fixed meeting error message

* Documentation update

* Update documentations

* Documentation update

* Documentation update
* add basic finance tracker functionality

* implement graph for finance

* fixed checkstyle

* fix no newline at EOF

* changed data to docs

* implement back feature

* fixed no newline at EOF

* fixed back feature bug

* updated ug/dg

* fix checkstyle

* fixed some bugs

* fix checkstyle

* implement excel

* fix checkstyle

* small fixes

* wtf is happening

* fixed navigating of UiDisplay

* updat dg

* fix checkstyle

* final commit

* final final commit

* final final final commit
* Add setTimetable task appendix

* Add generate to appendix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants