[T13-1]Tutor Pal#57

Open

hrxiong wants to merge 634 commits intonus-cs2103-AY1819S1:masterfrom CS2103-AY1819S1-T13-1:master

+8,906-795

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

Commits on Nov 2, 2018

further change
LZYAndy
committed
further change
LZYAndy
committed
further change
LZYAndy
committed
further change
LZYAndy
committed
Merge pull request #118 from junjiee/master
ccl17
authored
Merge pull request #120 from hrxiong/master
ccl17
authored
fix error
Ong Jun Jie
committed
change
LZYAndy
committed
Merge branch 'master' into fix-userguide-and-add-fuzzy-matching
LZYAndy
authored
Merge remote-tracking branch 'upstream/master' into mybranch
ccl17
committed
Merge pull request #121 from junjiee/master
junjiee
authored
Merge commit 'e78373fa5b08d78106df4081c218f04f402ea330'
LZYAndy
committed
fix-userguide-and-add-fuzzy-matching
LZYAndy
committed
Edited ConfigTest for new app title
ccl17
committed
further change
LZYAndy
committed
further change
LZYAndy
committed
Merge pull request #119 from chenlu-chua/mybranch
ccl17
authored
Merge pull request #116 from LZYAndy/fix-userguide-and-add-fuzzy-matching
ccl17
authored
r
CJuanvip
committed
s
CJuanvip
committed
d
CJuanvip
committed
aa
CJuanvip
committed
e
CJuanvip
committed
d
CJuanvip
committed
s
CJuanvip
committed
sss
CJuanvip
committed
d
CJuanvip
committed
change user guide
LZYAndy
committed
Merge branch 'master' into commandChange
CJuanvip
authored
Merge pull request #122 from LZYAndy/change-user-guide
hrxiong
authored
d
CJuanvip
committed
Merge commit '3294ae23c38a18330cb9b3bf5b3bbeb02467df14' into commandChange
CJuanvip
committed
d
CJuanvip
committed
Merge branch 'commandChange' of https://github.com/CJuanvip/main into commandChange
CJuanvip
committed
Merge branch 'master' into commandChange
CJuanvip
committed
s
CJuanvip
committed
further change
LZYAndy
committed

Commits on Nov 3, 2018

Merge pull request #123 from LZYAndy/change-user-guide
junjiee
authored

Commits on Nov 4, 2018

Updated user guide
ccl17
committed

Commits on Nov 5, 2018

Commits on Nov 6, 2018

further changes
LZYAndy
committed
update time attribute in person
Ong Jun Jie
committed
update add parser, edit command and parser
Ong Jun Jie
committed
update model and storage
Ong Jun Jie
committed
correct model and storage
Ong Jun Jie
committed
further change
LZYAndy
committed
update test
Ong Jun Jie
committed
Revert "update test"
Ong Jun Jie
committed
Revert "Revert "update test""
Ong Jun Jie
committed
Revert "Revert "Revert "update test"""
Ong Jun Jie
committed
fix test
Ong Jun Jie
committed
fix style
Ong Jun Jie
committed
changed AddTimeCommand and DeleteTimeCommand to be by index instead of name
Ong Jun Jie
committed

Commits on Nov 7, 2018

fix test
Ong Jun Jie
committed
add DeleteTimeCommand, DeleteTimeCommandParser test, update UniquePersonListTest
Ong Jun Jie
committed
update UserGuide
Ong Jun Jie
committed
update test
Ong Jun Jie
committed
Merge remote-tracking branch 'upstream/master' into change-UI
LZYAndy
committed
Merge commit '423bd3e6f8475ad8bb33267e2178af6bc56bb55f' into commandChange
CJuanvip
committed
Update SuggestionCommandTest.java
CJuanvip
authored
Update SuggestionCommandParserTest.java
CJuanvip
authored
Update SuggestionCommandTest.java
CJuanvip
authored
Update SuggestionCommandTest.java
CJuanvip
authored
Update the details about the grade attribute more properly.
hrxiong
committed
Implemented promote command
ccl17
committed
Edited education
ccl17
committed
Update SuggestionCommandTest.java
CJuanvip
authored
Removed unnecessary loggers
ccl17
committed
Updated Ui.png
ccl17
committed
Edited addcommandtest
ccl17
committed
Merge pull request #113 from CJuanvip/commandChange
ccl17
authored
Merge pull request #164 from junjiee/master
ccl17
authored
change user guide
LZYAndy
committed
Updated userguide
ccl17
committed
Resolve conflicts
ccl17
committed
change user guide
LZYAndy
committed
Edited PromoteCommand
ccl17
committed
Merge remote-tracking branch 'upstream/master'
hrxiong
committed
Updated UserGuide with promote command details
ccl17
committed
Updated promote commands
ccl17
committed
Merge commit '353e0dfd01a868e67f6b5b806e20068f93f3f41d' into update-user-guide
LZYAndy
committed
Merge pull request #165 from LZYAndy/change-UI
LZYAndy
authored
Merge pull request #166 from hrxiong/master
LZYAndy
authored
Merge branch 'master' into update-user-guide
LZYAndy
authored
Merge pull request #167 from LZYAndy/update-user-guide
ccl17
authored
Update UserGuide.adoc
LZYAndy
authored
change on ui
LZYAndy
committed
change on ui
LZYAndy
committed
further change
LZYAndy
committed
further change
LZYAndy
committed
further change
LZYAndy
committed
Add the deleteGrade command
hrxiong
committed
fix checkstyle
hrxiong
committed
Merge branch 'master' into master
hrxiong
authored
add the deleteGrade into userguide
hrxiong
committed
Merge pull request #170 from hrxiong/master
CJuanvip
authored

Commits on Nov 8, 2018

update Ui.png
hrxiong
committed
Merge pull request #172 from hrxiong/master
hrxiong
authored
updated AddTimeCommand and DeleteTImeCommand
Ong Jun Jie
committed
further change
LZYAndy
committed
further change
LZYAndy
committed
Merge commit 'b790880e9f1c3bd72de7e8067e350258bcae4a24' into update-user-guide
LZYAndy
committed
Merge pull request #174 from junjiee/master
hrxiong
authored
Merge commit '6e27cc76db4936ad186e64862a76f07cb427ded2' into update-user-guide
LZYAndy
committed
resolve conflict
ccl17
committed
Merge remote-tracking branch 'upstream/master' into mybranch
ccl17
committed
further change
LZYAndy
committed
Edited EditCommand EditPersonDescriptor
ccl17
committed
Merge pull request #163 from chenlu-chua/mybranch
junjiee
authored
Merge commit '840b2562c64996377665a0d4d3cc8e295e1e9181' into update-user-guide
LZYAndy
committed
further change
LZYAndy
committed
further change
LZYAndy
committed
further change
LZYAndy
committed
further change
LZYAndy
committed
Merge remote-tracking branch 'upstream/master' into mybranch
ccl17
committed
further change
LZYAndy
committed
Fixed bug with promotecommand and updated equals and has of Person class
ccl17
committed
Fixed checkstyle
ccl17
committed
further change
LZYAndy
committed
Edited EarningsCommand equsls
ccl17
committed
further change
LZYAndy
committed
Merge pull request #175 from chenlu-chua/mybranch
LZYAndy
authored
Merge pull request #169 from LZYAndy/update-user-guide
ccl17
authored
Merge remote-tracking branch 'upstream/master' into mybranch
ccl17
committed
Fixed a bug where tutorpal cant be reopened after added a time before 1000hrs
ccl17
committed
Changed Graduated Tag to red color
ccl17
committed
Fixed bug where number of students promoted shown is wrong
ccl17
committed
Fixed checkstyle
ccl17
committed
Added PPP
ccl17
committed

Commits on Nov 9, 2018

Commits on Nov 10, 2018

updated portfolio
ccl17
committed

Commits on Nov 12, 2018

Merge branch 'addTest'
CJuanvip
committed
update ui picture to latest version
LZYAndy
committed
Merge pull request #180 from LZYAndy/change-ui-picture-to-latest-version
ccl17
authored
update Time attribute
Ong Jun Jie
committed
edit
CJuanvip
committed
Merge branch 'master' of https://github.com/CJuanvip/main
CJuanvip
committed
update UserGuide
Ong Jun Jie
committed
Update SuggestionCommandByIndexParser.java
CJuanvip
authored
Update SuggestionCommandByIndex.java
CJuanvip
authored
Update ExchangeTimeCommandParser.java
CJuanvip
authored
Update SuggestionCommandByIndexParser.java
CJuanvip
authored
Update SuggestionCommandByIndex.java
CJuanvip
authored
Update SuggestionCommandByIndex.java
CJuanvip
authored
d
CJuanvip
committed
Merge branch 'master' of https://github.com/CJuanvip/main
CJuanvip
committed
Updated user guide
ccl17
committed
Add test for add command system test to test more details about grade attribute
hrxiong
committed
d
CJuanvip
committed
Update ParserUtilTest.java
CJuanvip
authored
Update ExchangeTimeCommandTest.java
CJuanvip
authored
Update FilterByTimeCommandParserTest.java
CJuanvip
authored
Merge pull request #181 from CJuanvip/master
LZYAndy
authored
Update DeveloperGuide for Time and AddTimeCommand
Ong Jun Jie
committed
d
CJuanvip
committed
Merge branch 'master' of https://github.com/CJuanvip/main
CJuanvip
committed
d
CJuanvip
committed
add test for edit command system test to test more details about grade attribute
hrxiong
committed
Update SuggestionCommandTest.java
CJuanvip
authored
fix checkstyle
hrxiong
committed
update DeveloperGuide
Ong Jun Jie
committed
Update SuggestionCommandTest.java
CJuanvip
authored
update developerguide
Ong Jun Jie
committed
Update FilterByTimeCommandTest.java
CJuanvip
authored
Merge pull request #182 from CJuanvip/master
LZYAndy
authored
Merge pull request #183 from hrxiong/master
LZYAndy
authored
add DeleteGradeSystemTest.java
hrxiong
committed
tag userguide
Ong Jun Jie
committed
tag userguide
Ong Jun Jie
committed
add DeleteGradeCommandTest.java
hrxiong
committed
Add DeleteGradesCommandParserTest.java
hrxiong
committed
fix checkstyle
hrxiong
committed
add PPP
Ong Jun Jie
committed
Merge remote-tracking branch 'upstream/master'
hrxiong
committed
update url in ppp
Ong Jun Jie
committed
edit
CJuanvip
committed
Merge branches 'master' and 'master' of https://github.com/CJuanvip/main
CJuanvip
committed
Merge pull request #184 from hrxiong/master
CJuanvip
authored
Merge pull request #185 from CJuanvip/master
LZYAndy
authored
Updated earnings command
ccl17
committed
Edited userguide and developer guide
ccl17
committed
Merge pull request #187 from chenlu-chua/mybranch
hrxiong
authored
add ppp and change developer guide
LZYAndy
committed
fix checkstyle
Ong Jun Jie
committed
change some user guide, add PPP
hrxiong
committed
Merge branch 'master' into master
hrxiong
authored
Merge pull request #188 from LZYAndy/add-ppp-and-developer-guide
hrxiong
authored
Merge branch 'master' into master
hrxiong
authored
Merge branch 'master' into master
junjiee
authored
d
CJuanvip
committed
Merge pull request #189 from hrxiong/master
junjiee
authored
Merge branch 'master' into master
junjiee
authored
error
CJuanvip
committed
fix the use case in developer guide
hrxiong
committed
Updated readme
ccl17
committed
Merge pull request #186 from junjiee/master
LZYAndy
authored
Merge pull request #190 from CJuanvip/master
LZYAndy
authored
fix conflict
Ong Jun Jie
committed
Update lzyandy.adoc
LZYAndy
authored
ee
CJuanvip
committed
Merge pull request #191 from junjiee/master
junjiee
authored
Update lzyandy.adoc
LZYAndy
authored
Edited ppp
ccl17
committed
Merge pull request #192 from CJuanvip/master
junjiee
authored
update aboutus
Ong Jun Jie
committed
Update lzyandy.adoc
LZYAndy
authored
Merge remote-tracking branch 'upstream/master' into mybranch
ccl17
committed
Update AboutUs.adoc
LZYAndy
authored
update ppp and DG
hrxiong
committed
Merge pull request #193 from junjiee/master
junjiee
authored
no message
CJuanvip
committed
Merge remote-tracking branch 'upstream/master' into mybranch
ccl17
committed
Updated aboutus
ccl17
committed
Updated developerguide
ccl17
committed
Merge pull request #194 from CJuanvip/master
ccl17
authored
Merge pull request #195 from chenlu-chua/mybranch
junjiee
authored
update PPP and developerGuide
hrxiong
committed
Merge remote-tracking branch 'upstream/master'
hrxiong
committed
update PPP
hrxiong
committed
Update AboutUs.adoc
LZYAndy
authored
Merge pull request #196 from hrxiong/master
junjiee
authored
Updated mainapp version number
ccl17
committed
update PPP
hrxiong
committed
j
CJuanvip
committed
Merge pull request #197 from chenlu-chua/mybranch
LZYAndy
authored
Merge pull request #198 from hrxiong/master
junjiee
authored
Merge pull request #199 from CJuanvip/master
ccl17
authored
Update userguide
ccl17
committed
update developerguide
Ong Jun Jie
committed
Merge pull request #200 from chenlu-chua/mybranch
junjiee
authored
Merge pull request #201 from junjiee/master
junjiee
authored
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T13-1/main
Ong Jun Jie
committed
update developerguide
Ong Jun Jie
committed
Merge branch 'master' into master
junjiee
authored
Merge pull request #202 from junjiee/master
junjiee
authored