new bug fixed#22

Open

XUHUAKing wants to merge 553 commits intokhwang0:masterfrom

COMP3111Group8:master

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

Commits on Nov 19, 2017

change some format for reminder visualization
XUHUAKing
committed
2.1
LIUChengAndr
committed
change some format for reminder visualization 2
XUHUAKing
committed
Merge pull request #37 from LIUChengAndr/master
XUHUAKing
authored
first test after merging LC and HXH
XUHUAKing
committed
successful version for reminder& dietconsump but still fail for generating plan
XUHUAKing
committed
Merge pull request #38 from XUHUAKing/master
XUHUAKing
authored
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
try multiuser 1.0

Scott LIU
authored and
Scott LIU
committed
try multiuser 1.1

Scott LIU
authored and
Scott LIU
committed
2.1
LIUChengAndr
committed
2.1
LIUChengAndr
committed
try multiuser 1.2

Scott LIU
authored and
Scott LIU
committed
2.1
LIUChengAndr
committed
Merge pull request #39 from LIUChengAndr/master
LIUChengAndr
authored
try multiuser 1.4

Scott LIU
authored and
Scott LIU
committed
try multiuser 2.0 success

Scott LIU
authored and
Scott LIU
committed
Merge pull request #40 from hliuav/master
lchenbg
authored
fix the display format of diet_plan
XUHUAKing
committed
Merge remote-tracking branch 'upstream/master'
XUHUAKing
committed
Merge pull request #41 from XUHUAKing/master
XUHUAKing
authored
coupon ware house added
lchenbg
committed
coupon ware house added
lchenbg
committed
add searchlocaldatabase in healthpedia

Scott LIU
authored and
Scott LIU
committed
try add database check in menureader

Scott LIU
authored and
Scott LIU
committed
test coupon
lchenbg
committed
test coupon
lchenbg
committed
test coupon
lchenbg
committed
try add menureader 2.1

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.2

Scott LIU
authored and
Scott LIU
committed
2.1
LIUChengAndr
committed
try add menureader 2.3

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.4

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.4 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.4 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.4 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.5 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.6 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.6 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.7 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.7 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.7 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.8 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.8 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.8 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.8 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.8 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.8 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 2.8 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 3.0 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 4.5 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 4.5 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 4.6 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 4.7 test

Scott LIU
authored and
Scott LIU
committed
try add menureader 5.0 test change a lot

Scott LIU
authored and
Scott LIU
committed
test coupon
lchenbg
committed
test coupon
lchenbg
committed
test coupon
lchenbg
committed
test coupon
lchenbg
committed
test coupon
lchenbg
committed
test coupon
lchenbg
committed
test coupon
lchenbg
committed
test coupon
lchenbg
committed
change menureader 1.0

Scott LIU
authored and
Scott LIU
committed
change menureader 1.1

Scott LIU
authored and
Scott LIU
committed
change menureader 1.2

Scott LIU
authored and
Scott LIU
committed
test coupon
lchenbg
committed
change menureader 1.3

Scott LIU
authored and
Scott LIU
committed
change menureader 1.4

Scott LIU
authored and
Scott LIU
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
Merge branch 'master' into master
hliuav
authored
coupon testing
lchenbg
committed
Merge branch 'master' into master
hliuav
authored
Merge pull request #42 from hliuav/master
hliuav
authored
coupon testing
lchenbg
committed
remove detailed user

Scott LIU
authored and
Scott LIU
committed
add testers
XUHUAKing
committed
add testers
XUHUAKing
committed
add tester
XUHUAKing
committed
test
zengkuang
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
test
zengkuang
committed
coupon testing
lchenbg
committed
3.0
LIUChengAndr
committed
simplyfy stagehandler

Scott LIU
authored and
Scott LIU
committed
simplyfy stagehandler

Scott LIU
authored and
Scott LIU
committed
simplyfy stagehandler

Scott LIU
authored and
Scott LIU
committed
remove unuse

Scott LIU
authored and
Scott LIU
committed
coupon testing
lchenbg
committed
Merge pull request #43 from hliuav/master
hliuav
authored
3.5
LIUChengAndr
committed
test
zengkuang
committed
add testers
XUHUAKing
committed
Merge remote-tracking branch 'upstream/master'
XUHUAKing
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
test
zengkuang
committed
coupon testing
lchenbg
committed
Merge pull request #44 from zengkuang/master
zengkuang
authored
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
test
LIUChengAndr
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
add testers for SQL and Users up to 11%, change conidtion in gen_plan, add default values in foodinfo
XUHUAKing
committed
Merge remote-tracking branch 'upstream/master'
XUHUAKing
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
Merge pull request #46 from XUHUAKing/master
XUHUAKing
authored
Merge pull request #45 from LIUChengAndr/master
XUHUAKing
authored
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
merging tester cases from HXH and LC, achieve 100% coverage in SQL and 30% coverage in total without stagehandler
XUHUAKing
committed
Merge pull request #47 from XUHUAKing/master
XUHUAKing
authored
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
coupon testing
lchenbg
committed
Improve
zengkuang
committed
Merge remote-tracking branch 'upstream/master'
zengkuang
committed
extra feature implemented
lchenbg
committed
4.0
LIUChengAndr
committed
4.0
LIUChengAndr
committed
merged
lchenbg
committed
merged
lchenbg
committed
Merge pull request #48 from lchenbg/master
hliuav
authored
javadoc half

Scott LIU
authored and
Scott LIU
committed
merged javadoc half with extra re

Scott LIU
authored and
Scott LIU
committed
merged javadoc half with extra re build success

Scott LIU
authored and
Scott LIU
committed
merged javadoc half with extra re build success

Scott LIU
authored and
Scott LIU
committed
merged javadoc half with extra re build success

Scott LIU
authored and
Scott LIU
committed
merged javadoc half with extra re build success 1.0

Scott LIU
authored and
Scott LIU
committed
merged javadoc half with extra re build success 1.1

Scott LIU
authored and
Scott LIU
committed

Commits on Nov 20, 2017

merged javadoc half with extra bug fix 1.0

Scott LIU
authored and
Scott LIU
committed
merged javadoc half with extra bug fix 1.0

Scott LIU
authored and
Scott LIU
committed
extra feature debugged
lchenbg
committed
merged javadoc half with extra bug still 1.0

Scott LIU
authored and
Scott LIU
committed
Merge pull request #50 from hliuav/master
hliuav
authored
extra feature debugged
lchenbg
committed
extra feature debugged
lchenbg
committed
extra feature debugged
lchenbg
committed
merged
lchenbg
committed
merged
lchenbg
committed
merged
lchenbg
committed
merged
lchenbg
committed
merged
lchenbg
committed
merged
lchenbg
committed
extra requirement bug fixed
lchenbg
committed
javadoc done for extra feature required classes
lchenbg
committed
extra requirement bug fixed
lchenbg
committed
javadoc done for extra feature required classes
lchenbg
committed
5.0
LIUChengAndr
committed
5.0
LIUChengAndr
committed
5.1
LIUChengAndr
committed
5.1
LIUChengAndr
committed
javadoc done for extra feature required classes
lchenbg
committed
javadoc done for extra feature required classes
lchenbg
committed
javadoc done for extra feature required classes
lchenbg
committed
Input user-defined food test
zengkuang
committed
Merge pull request #53 from LIUChengAndr/master
hliuav
authored
Merge branch 'master' into master
hliuav
authored
Merge branch 'master' into master
hliuav
authored
Merge pull request #54 from lchenbg/master
hliuav
authored
test
zengkuang
committed
test
zengkuang
committed
try fix bugs

Scott LIU
authored and
Scott LIU
committed
Merge branch 'master' of https://github.com/COMP3111Group8/Line-chatbot-for-COMP3111

Scott LIU
authored and
Scott LIU
committed
event killing
lchenbg
committed
Event removed from stage handlers
lchenbg
committed
test
zengkuang
committed
Event removed from stage handlers
lchenbg
committed
Event removed from stage handlers
lchenbg
committed
Merge branch 'eventkilling'
lchenbg
committed
Merge pull request #55 from lchenbg/master
lchenbg
authored
one more javadoc

Scott LIU
authored and
Scott LIU
committed
merge with

Scott LIU
authored and
Scott LIU
committed
test
zengkuang
committed
test
zengkuang
committed
start to work on stageHandlerTester
XUHUAKing
committed
test
zengkuang
committed
Merge remote-tracking branch 'upstream/master'
zengkuang
committed
Merge pull request #56 from zengkuang/master
zengkuang
authored
merge

Scott LIU
authored and
Scott LIU
committed
comment all test cases to increase building speed && merge
XUHUAKing
committed
before merge
XUHUAKing
committed
Merge pull request #57 from XUHUAKing/master
zengkuang
authored
Delete lots of useless shit
lchenbg
committed
merge one more javadoc

Scott LIU
authored and
Scott LIU
committed
Merge pull request #58 from hliuav/master
zengkuang
authored
redundant methods removed
lchenbg
committed
Merge branch 'master' into master
lchenbg
authored
Merge branch 'master' into master
lchenbg
authored
Merge pull request #59 from lchenbg/master
lchenbg
authored
Redundant methods removed/ bug fixed
lchenbg
committed
Merge pull request #60 from lchenbg/master
lchenbg
authored
test
zengkuang
committed
test
zengkuang
committed
fix test problems
XUHUAKing
committed
Merge pull request #61 from XUHUAKing/master
XUHUAKing
authored
test
zengkuang
committed
test
zengkuang
committed
fix test problems1.0
XUHUAKing
committed
fix test problems 2.0, successful build
XUHUAKing
committed
Merge pull request #62 from XUHUAKing/master
XUHUAKing
authored
Merge remote-tracking branch 'upstream/master'
zengkuang
committed
Merge pull request #63 from zengkuang/master
zengkuang
authored
javadoc almost done

Scott LIU
authored and
Scott LIU
committed
javadoc

Scott LIU
authored and
Scott LIU
committed
Full version with javadoc

Scott LIU
authored and
Scott LIU
committed
7.0
LIUChengAndr
committed
final
LIUChengAndr
committed