[CS2113-T14-2] eCardnomics#39

Open

kaijiel24 wants to merge 541 commits intonus-cs2113-AY2021S1:masterfrom AY2021S1-CS2113-T14-2:master

+8,433-143

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

Commits on Oct 28, 2020

Commits on Oct 31, 2020

Commits on Nov 1, 2020

Commits on Nov 3, 2020

Fixed some PE-D and Peer Review DG bugs

kaijiel24
authored and
kaijiel24
committed
Fixed index error messages

kaijiel24
authored and
kaijiel24
committed
Update Text-Ui-Test

kaijiel24
authored and
kaijiel24
committed
Merge pull request #164 from kaijiel24/master
kaijiel24
authored

Commits on Nov 5, 2020

Commits on Nov 6, 2020

add functional and test code for extra restrictions on question and answer to contain alphanumeric
exuberant-duck
committed
Merge pull request #171 from zhixiangteoh/master
LiewWS
authored
implement pretty print for game mode output
LiewWS
committed
Implement log to file
LiewWS
committed
update .gitignore
LiewWS
committed
Merge pull request #172 from LiewWS/master
kaijiel24
authored
cut PPP UG and DG extracts images
exuberant-duck
committed
Merge pull request #173 from zhixiangteoh/master
zhixiangteoh
authored
Add Original Color option for pptx

kaijiel24
authored and
kaijiel24
committed
Merged with upstream

kaijiel24
authored and
kaijiel24
committed
Fixed logger merge issue in NormalParser and Ui

kaijiel24
authored and
kaijiel24
committed
Add Default Color Scheme options to pptx

kaijiel24
authored and
kaijiel24
committed
Update UG for pptx Color options

kaijiel24
authored and
kaijiel24
committed
Merged from master

kaijiel24
authored and
kaijiel24
committed
Fixed length issue in help command

kaijiel24
authored and
kaijiel24
committed
Merge pull request #175 from kaijiel24/master
LiewWS
authored
Fix index out of bounds error when -cs option is used
LiewWS
committed
Merge pull request #176 from LiewWS/master
kaijiel24
authored
Fixed help printing issue

kaijiel24
authored and
kaijiel24
committed
Fixed help printing issue

kaijiel24
authored and
kaijiel24
committed
Add PPP for wangwaynesg
wangwaynesg
committed
Merge pull request #177 from kaijiel24/master
kaijiel24
authored
fix broken links to commands in UG
LiewWS
committed
update FAQ section of UG
LiewWS
committed
Merge pull request #180 from LiewWS/master
LiewWS
authored
Merge branch 'branch-wangwaynesgPPP' of https://github.com/wangwaynesg/tp
wangwaynesg
committed
Add wangwaynesg PPP
wangwaynesg
committed
update PPP
LiewWS
committed
update documentation
LiewWS
committed
Merge pull request #182 from LiewWS/master
LiewWS
authored
Merge pull request #181 from wangwaynesg/master
LiewWS
authored

Commits on Nov 7, 2020

add DuplicateDeckException
alwaysnacy
committed
fix duplicate decks
alwaysnacy
committed
fix multiple /tags in CreateCommand
alwaysnacy
committed
update Tag and Untag Command
alwaysnacy
committed
fix checkstyles
alwaysnacy
committed
Merge pull request #183 from alwaysnacy/Trang-fix-2.0
alwaysnacy
authored
add tag to DecksCommnad output without pretty 1-liner
alwaysnacy
committed
Merge pull request #184 from alwaysnacy/Trang-fix-2.0
alwaysnacy
authored
clean codes
alwaysnacy
committed
no message
alwaysnacy
committed
Merge pull request #185 from alwaysnacy/Trang-fix-2.0
alwaysnacy
authored
Update kaijiel24 PPP

kaijiel24
authored and
kaijiel24
committed
Fix Storage bugs
wangwaynesg
committed
Merge pull request #186 from wangwaynesg/master
wangwaynesg
authored
Fix Storage bugs where decks with no tags are not loaded
wangwaynesg
committed
Fix Storage bugs where decks with no tags are not loaded and remove "size" from data files
wangwaynesg
committed
Fix List Command regarding incorrect "/ans" argument
wangwaynesg
committed
Fix minor Storage bug
wangwaynesg
committed
Merge pull request #206 from wangwaynesg/master
wangwaynesg
authored
Update pptx Color Options

kaijiel24
authored and
kaijiel24
committed
Resolve merge conflict

kaijiel24
authored and
kaijiel24
committed
Fix force y output and dash line to 80 char

kaijiel24
authored and
kaijiel24
committed
Merge pull request #207 from kaijiel24/master
kaijiel24
authored
fix FlashCard test case
LiewWS
committed
Merge pull request #209 from LiewWS/master
LiewWS
authored
Update UG and DG

kaijiel24
authored and
kaijiel24
committed
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-2/tp

kaijiel24
authored and
kaijiel24
committed
Merge pull request #210 from kaijiel24/master
kaijiel24
authored

Commits on Nov 8, 2020

Commits on Nov 9, 2020

fix broken link to About US
LiewWS
committed
fix broken link to storage FAQ in UG
LiewWS
committed
update version number in case we forget later
LiewWS
committed
update ppp name to format required
LiewWS
committed
Rename LiewWS.md to liewws.md
LiewWS
authored
Fix image size
wangwaynesg
committed
Merge pull request #228 from wangwaynesg/master
wangwaynesg
authored
clarify requirements of adding question and answer in UG
LiewWS
committed
Block user from entering non-alphanumeric qn and ans in update
LiewWS
committed
update UserGuide to be specific about updating question and answers to non-alphanumeric characters
LiewWS
committed
Fixed typos in DG

kaijiel24
authored and
kaijiel24
committed
Update Storage format read and write
wangwaynesg
committed
Update UG to match changes in Storage format
wangwaynesg
committed
Merge pull request #229 from wangwaynesg/master
wangwaynesg
authored
Update picture size to fit within 100px

kaijiel24
authored and
kaijiel24
committed
Update PPP

kaijiel24
authored and
kaijiel24
committed
Merge pull request #222 from kaijiel24/master
kaijiel24
authored
update profile picture
LiewWS
committed
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-2/tp into master
LiewWS
committed
update about us to include profile pic
LiewWS
committed
Updated PPP and DG

kaijiel24
authored and
kaijiel24
committed
Merge pull request #230 from kaijiel24/master
kaijiel24
authored
Merge pull request #227 from LiewWS/master
kaijiel24
authored
Update PPP

kaijiel24
authored and
kaijiel24
committed
Merge pull request #231 from kaijiel24/master
kaijiel24
authored
Update PPP

kaijiel24
authored and
kaijiel24
committed
Merge pull request #232 from kaijiel24/master
kaijiel24
authored
update DG and UG
alwaysnacy
committed
Add files via upload
alwaysnacy
authored
update PPP link
exuberant-duck
committed
update UG, DG and PPP
alwaysnacy
committed
Merge pull request #233 from zhixiangteoh/master
zhixiangteoh
authored
Merge branch 'alwaysnacy-Trang-addTests' into master
alwaysnacy
committed
no message
alwaysnacy
committed
update toc dg ug
exuberant-duck
committed
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-2/tp into master
alwaysnacy
committed
Merge pull request #235 from zhixiangteoh/master
zhixiangteoh
authored
no message
alwaysnacy
committed
Merge pull request #236 from alwaysnacy/master
alwaysnacy
authored
Fixed bugs for pptx in deck mode and updated UG and DG

kaijiel24
authored and
kaijiel24
committed
Fixed bugs for pptx in deck mode and updated UG and DG

kaijiel24
authored and
kaijiel24
committed
Update DG Storage sequence diagram to have transparent background
wangwaynesg
committed
Merge pull request #239 from kaijiel24/master
kaijiel24
authored
Merge pull request #240 from wangwaynesg/master
wangwaynesg
authored
Update DG diagram

kaijiel24
authored and
kaijiel24
committed
Merge pull request #241 from kaijiel24/master
kaijiel24
authored
fix white bg images
LiewWS
committed
Merge pull request #242 from LiewWS/master
LiewWS
authored
fixes #237
exuberant-duck
committed
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-2/tp
exuberant-duck
committed
update UG setup instructions
exuberant-duck
committed
Merge pull request #243 from zhixiangteoh/master
zhixiangteoh
authored
Add files via upload
alwaysnacy
authored
Add files via upload
alwaysnacy
authored
Delete alwaysnacy.png
alwaysnacy
authored
Add files via upload
alwaysnacy
authored
Delete alwaysnacy.png
alwaysnacy
authored
Add files via upload
alwaysnacy
authored
Delete alwaysnacy.png
alwaysnacy
authored
Add files via upload
alwaysnacy
authored