[v1.5][T09-B2] CollegeZone #47

Open

deborahlow97 wants to merge 833 commits intonus-cs2103-AY1718S2:masterfrom CS2103JAN2018-T09-B2:master

+33,261-1,726

This pull request is big! We're only showing the most recent 250 commits

Commits on Apr 13, 2018

Clean up CalendarPanel
fuadsahmawi
committed
Added new data util file to populate CollegeZone with sample reminder data
fuadsahmawi
committed
Edited samplereminderdatautil.java
fuadsahmawi
committed
Update goal and theme use cases
deborahlow97
committed
Merge pull request #10 from CS2103JAN2018-T09-B2/master
zuweitrack
authored
Edit typo and add sortgoal use case
deborahlow97
committed
Merge branch 'master' into V1.5DeveloperGuide
deborahlow97
authored
Edit RateCommand to handle invalid entries
zuweitrack
committed
Add username for collating
zuweitrack
committed
Edit RateCommand message
zuweitrack
committed
Merge pull request #229 from deborahlow97/V1.5DeveloperGuide
deborahlow97
authored
Update sample project portfolio
zuweitrack
committed
Edit SeekRaCommand message
zuweitrack
committed
Edit rate command logic
zuweitrack
committed
Add ShowLofCommand
zuweitrack
committed
Merge branch 'master' into v1.5-RateCommand
zuweitrack
authored
Add import statement for ShowLofCommand
zuweitrack
committed
Merge branch 'v1.5-RateCommand' of https://github.com/zuweitrack/main into v1.5-RateCommand
zuweitrack
committed
edit indentation
zuweitrack
committed
Merge pull request #231 from zuweitrack/v1.5-RateCommand
zuweitrack
authored
Merge pull request #11 from CS2103JAN2018-T09-B2/master
zuweitrack
authored

Commits on Apr 14, 2018

Add collate for main files
zuweitrack
committed
Edit ProjPortfolio and user guide
zuweitrack
committed
Edit project portfolio and user guide
zuweitrack
committed
Collate test
zuweitrack
committed
Merge pull request #42 from CS2103JAN2018-T09-B2/master
deborahlow97
authored
Shift rate command portion in user guide
zuweitrack
committed
Edit proj portfolio
zuweitrack
committed
Edit user guide
zuweitrack
committed
Edit show portion of user guide
zuweitrack
committed
add newline at userguide
zuweitrack
committed
Merge branch 'master' into master
fuadsahmawi
authored
Merge pull request #232 from zuweitrack/v1.5-Test-and-collate
zuweitrack
authored
Merge branch 'master' into master
fuadsahmawi
authored
Add bubblegum theme
deborahlow97
committed
Merge branch 'master' into V1.5NewThemeColour
deborahlow97
authored
Merge pull request #233 from fuadsahmawi/master
fuadsahmawi
authored
Merge branch 'master' into V1.5NewThemeColour
deborahlow97
authored
Merge pull request #25 from CS2103JAN2018-T09-B2/master
fuadsahmawi
authored
Merge pull request #12 from CS2103JAN2018-T09-B2/master
zuweitrack
authored
Merge pull request #235 from deborahlow97/V1.5NewThemeColour
deborahlow97
authored
Edit user guide format
zuweitrack
committed
Update developer guide
zuweitrack
committed
Deleted Print Statements

sham-sheer
authored and
sham-sheer
committed
Merge branch 'master' into personalPortfolio
sham-sheer
authored
Merge pull request #237 from sham-sheer/personalPortfolio
sham-sheer
authored
UG changes
deborahlow97
committed
Merge branch 'master' into V1.5Documentation
deborahlow97
authored
Merge pull request #239 from deborahlow97/V1.5Documentation
deborahlow97
authored
Update AboutUs
deborahlow97
committed
Update contact us
deborahlow97
committed
Changed Birthday tests

sham-sheer
authored and
sham-sheer
committed
Merge branch 'master' into personalPortfolio
sham-sheer
authored
Annoying Deborah

sham-sheer
authored and
sham-sheer
committed
Merge branch 'personalPortfolio' of https://github.com/A0158738X/main into personalPortfolio

sham-sheer
authored and
sham-sheer
committed
Annoying Deborah

sham-sheer
authored and
sham-sheer
committed
Annoying Deborah

sham-sheer
authored and
sham-sheer
committed
Edited user guide
fuadsahmawi
committed
Update use cases
deborahlow97
committed
Merge branch 'master' into editUserGuide
fuadsahmawi
authored
Merge pull request #241 from fuadsahmawi/editUserGuide
fuadsahmawi
authored
Merge branch 'master' into V1.5Documentation
deborahlow97
authored
Merge pull request #242 from deborahlow97/V1.5Documentation
deborahlow97
authored
Edited Test files

sham-sheer
authored and
sham-sheer
committed
Merge branch 'master' into personalPortfolio
sham-sheer
authored
Edited Test files

sham-sheer
authored and
sham-sheer
committed
Changed images for reminder section
fuadsahmawi
committed
Merge branch 'master' into editUserGuide
fuadsahmawi
authored
Merge pull request #240 from sham-sheer/personalPortfolio
sham-sheer
authored
Edit to pass checkstyle
fuadsahmawi
committed
Merge branch 'master' into editUserGuide
fuadsahmawi
authored
Merge pull request #243 from fuadsahmawi/editUserGuide
fuadsahmawi
authored
Edited user guide
fuadsahmawi
committed
Merge branch 'editUserGuide' of https://github.com/fuadsahmawi/main into editUserGuide
fuadsahmawi
committed
Merge branch 'master' into editUserGuide
fuadsahmawi
authored
Merge pull request #245 from fuadsahmawi/editUserGuide
fuadsahmawi
authored
Merge pull request #26 from CS2103JAN2018-T09-B2/master
fuadsahmawi
authored
Edit use case
fuadsahmawi
committed
Merge branch 'master' of https://github.com/fuadsahmawi/main into editDeveloperGuide
fuadsahmawi
committed
Update developer guide images
deborahlow97
committed
Update UG image and preamble
deborahlow97
committed
Merge branch 'master' into V1.5Documentation
deborahlow97
authored
Merge pull request #246 from deborahlow97/V1.5Documentation
deborahlow97
authored
Update UG DG
deborahlow97
committed
Merge branch 'V1.5Documentation' of https://github.com/deborahlow97/main into V1.5Documentation
deborahlow97
committed
Merge branch 'master' into V1.5Documentation
deborahlow97
authored
Edit dev guide
zuweitrack
committed
Merge pull request #247 from deborahlow97/V1.5Documentation
deborahlow97
authored
Merge pull request #44 from CS2103JAN2018-T09-B2/master
deborahlow97
authored
Edit Reminder feature in Developer Guide
fuadsahmawi
committed
Edited userguide and project portfolio
fuadsahmawi
committed
Merge branch 'master' into editDeveloperGuide
fuadsahmawi
authored
Merge pull request #13 from CS2103JAN2018-T09-B2/master
zuweitrack
authored
Edit proj portfolio
zuweitrack
committed
Pull to local
zuweitrack
committed
Remove trailing whitespaces
fuadsahmawi
committed
Merge branch 'editDeveloperGuide' of https://github.com/fuadsahmawi/main into editDeveloperGuide
fuadsahmawi
committed
Edit dev guide
zuweitrack
committed
Merge pull request #248 from fuadsahmawi/editDeveloperGuide
fuadsahmawi
authored
Update dev guide
deborahlow97
committed
Edit message in Rate Command
zuweitrack
committed
Added tab autocomplete and its relevant test

sham-sheer
authored and
sham-sheer
committed
Merge branch 'V1.5Documentation' of https://github.com/deborahlow97/main into V1.5Documentation
deborahlow97
committed
Merge branch 'master' into master
deborahlow97
authored
Added tab autocomplete and its relevant test

sham-sheer
authored and
sham-sheer
committed
Merge branch 'master' of https://github.com/A0158738X/main

sham-sheer
authored and
sham-sheer
committed
Edit project portfolio and dev guide
zuweitrack
committed
Delete file in wrong location
zuweitrack
committed
Merge branch 'master' into v1.5-Developer-Guide-update
zuweitrack
authored
Merge pull request #251 from zuweitrack/v1.5-Developer-Guide-update
zuweitrack
authored
Merge pull request #14 from CS2103JAN2018-T09-B2/master
zuweitrack
authored
Added tab autocomplete and its relevant test

sham-sheer
authored and
sham-sheer
committed
Merge branch 'master' into master
sham-sheer
authored
Update developer guide
deborahlow97
committed
Merge branch 'master' into V1.5Documentation
deborahlow97
authored
Add test for ShowLofCommand
zuweitrack
committed
Merge pull request #250 from sham-sheer/master
sham-sheer
authored
Merge branch 'master' into V1.5Documentation
deborahlow97
authored
Merge pull request #252 from deborahlow97/V1.5Documentation
deborahlow97
authored
Collate main and test code
zuweitrack
committed
Merge pull request #45 from CS2103JAN2018-T09-B2/master
deborahlow97
authored
Add 2 RA persons to sample data util
zuweitrack
committed
Merge branch 'master' into v1.5-Test-Case-for-Rate-and-Show-Commands
zuweitrack
authored
Removed unnecessary code
deborahlow97
committed
Add RA color tag
zuweitrack
committed
Merge branch 'v1.5-Test-Case-for-Rate-and-Show-Commands' of https://github.com/zuweitrack/main into v1.5-Test-Case-for-Rate-and-Show-Commands
zuweitrack
committed
Merge pull request #254 from zuweitrack/v1.5-Test-Case-for-Rate-and-Show-Commands
zuweitrack
authored
Remove extra codes
deborahlow97
committed
Update UG DG
deborahlow97
committed

Commits on Apr 15, 2018