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

[W16-2] SocialCare #174

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

[W16-2] SocialCare #174

wants to merge 897 commits into from

Conversation

iMarbles
Copy link

@iMarbles iMarbles commented Nov 2, 2018

@iMarbles
Copy link
Author

iMarbles commented Nov 2, 2018

Previous PR #16 . Closed previous PR and open this because Travis wasn't building properly. More information here

AmabelYeo and others added 22 commits November 4, 2018 20:48
@AmabelYeo
Statistics.java: Backend
d7b3059
@AmabelYeo
Overview.java: Method for caculating number of events
91b6871
@AmabelYeo
Overview.java: Volunteer Demographic
6bd52a4
@Kratious
Add Overview panel and associated events
391430f
@Kratious
Add UI handling for overview command
d71b4be
@Kratious
Add javadoc comments in MainWindow.java
88a9113
@Kratious
Merge pull request #219 from iMarbles/dev
fc8a69b 
Overview.java
@Kratious
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W16-2/main …
9b4a35b 
…into event-management
@sharan8
ExportCertCommand.java: Update design & contents of certificate
6d81d93
@sharan8
ExportCertCommand.java: Export for volunteers with records only
31befb3
@sharan8
Update tests to reflect exporting for volunteers with records only
095713a
@sharan8
ExportCertCommand.java: Add log message for folder creation
4aff101
@sharan8
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W16-2/main …
4b075b2 
…into exportcert-command
@sharan8
ExportCertCommand.java: Remove redundant support for absent event rec…
f240bed 
…ords
@Kratious
Add panes for event overview
b61844a
@Kratious
Add area for volunteer overview
4544592
@AmabelYeo
Merge pull request #221 from Kratious/event-management
7eef614 
Add overview panel and UI handling
@AmabelYeo
Overview: Added charts
d59aacf
@Kratious
Add event type indicators in OverviewPanel.java
5c0632f
@AmabelYeo
OverviewPanel.java: Checkstyle
8e6cac1
@Kratious
Merge pull request #223 from iMarbles/dev
5fd1803 
Overview: Charts
@Kratious
Fix formatting in OverviewPanel.fxml
da0ff74
afiqlattif and others added 30 commits November 12, 2018 22:31
@afiqlattif
DeveloperGuide.adoc: Added 'Add Volunteer Command' section in Impleme…
9193384 
…ntation
@afiqlattif
afiqlattif.adoc: Updated PPP
215fa03
@AmabelYeo
DeveloperGuide.adoc: manage command
74e64bb
@afiqlattif
Fixed Checkstyle
2fe6421
@AmabelYeo
DeveloperGuide.adoc: switch command
2168f8d
@AmabelYeo
Language
832f376
@AmabelYeo
UserGuide.adoc: Consistency
92557e5
@AmabelYeo
Consistency
065dd30
@Kratious
Update PPP for kratious.adoc
14976df
@afiqlattif
Update PPP for afiqlattif
453ba7e
@Kratious
Merge pull request #255 from iMarbles/docs-DG
70b5214 
DeveloperGuide.adoc: Updates
@Kratious
Resize images in event management section of UserGuide.adoc
667ca19
@afiqlattif
Resize images for volunteer management
de2585e
@Kratious
Remove comments from code snippets in DeveloperGuide.adoc
eddac33
@Kratious
Remove PR references from kratious.adoc
5797305
@Kratious
Remove PR reference in kratious.adoc
42c98d7
@sharan8
Update sharan8.adoc PPP
5664fb0
@AmabelYeo
imarbles.adoc: s
6dc8dc9
@sharan8
sharan8.adoc: Cut word count to reduce number of pages
9c473c9
@sharan8
Guides: Reduce image sizes
f2a8e8b
@Kratious
Merge pull request #260 from iMarbles/master
534009e 
imarbles.adoc: s
@AmabelYeo
Merge pull request #259 from Kratious/dg-documentation
68432a4 
PPP Update for kratious.adoc
@sharan8
DeveloperGuide.adoc: Clean up appendix section
9709df6
@AmabelYeo
Merge pull request #257 from afiqlattif/update-docs
03960d8 
DeveloperGuide.adoc: Update Implementation
@sharan8
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W16-2/main …
e401482 
…into exportcert-developerguide
@AmabelYeo
Merge pull request #256 from sharan8/exportcert-command
37055c6 
`exportcert` final updates
@Kratious
Update Ui.png
911b43c
@sharan8
Fix conflicts
855dd3d
@AmabelYeo
Merge pull request #258 from sharan8/exportcert-developerguide
245ba8d 
Updates to `exportcert` documentation and sharan8's PPP
@AmabelYeo
Merge pull request #261 from Kratious/dg-documentation
65a198e 
Update Ui.png
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joanneong joanneong joanneong left review comments

Assignees

@joanneong joanneong

Labels
Mid-v1.1-Reviewed Mid-v1.4-Reviewed team.2 tutorial.W16 v1.1-Reviewed v1.2-Reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@iMarbles @joanneong @nus-se-pr-bot @AmabelYeo @Kratious @sharan8 @Scrubbius @afiqlattif