forked from se-edu/addressbook-level4
-
Notifications
You must be signed in to change notification settings - Fork 69
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.
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
[v1.1][T16-B1] Catalogue #99
Open
khiayi
wants to merge
312
commits into
nus-cs2103-AY1718S2:master
Choose a base branch
from
CS2103JAN2018-T16-B1:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 13 commits
Commits
Show all changes
312 commits
Select commit
Hold shift + click to select a range
da4c1a4
Merge pull request #16 from CS2103JAN2018-T16-B1/Refactor
khiayi 87fd30a
Resolve Conflict
qiuhaohao dd2bf83
Remove trailing space
qiuhaohao 50554b0
Fix style
qiuhaohao fc1bcfc
Removed last HelpCommandSystemTest
qiuhaohao 660af54
Merge pull request #14 from CS2103JAN2018-T16-B1/add-login
qiuhaohao df03bc0
Merge pull request #1 from CS2103JAN2018-T16-B1/master
chantiongley 3e8052a
Update Logic
qiuhaohao b0dd837
Implement Account
qiuhaohao 6fe1a9c
Fixed ModelManager
qiuhaohao 396264a
Update part of the test
qiuhaohao d9dc3d5
Update tests
qiuhaohao 9eac9d4
Integrate Accountlist storage in mainapp
qiuhaohao 4d4b4de
Changed UniqueAccountList's internal list to ArrayList
qiuhaohao 9182cdc
Update test
qiuhaohao b16c440
Update devGuide
qiuhaohao 1d40604
Fix style partially
qiuhaohao b2a0977
Fix style some errors
qiuhaohao 1def46d
Fix style errors
qiuhaohao 295fbde
Fix some style error, commit before trying formatter
qiuhaohao afd9379
Fix import order
qiuhaohao 8c61f45
Fix all style error
qiuhaohao 6df7a77
Merge pull request #31 from CS2103JAN2018-T16-B1/account-list
qiuhaohao accd5c4
Merge pull request #3 from CS2103JAN2018-T16-B1/master
chantiongley 3e50403
Add containsUsername and searchByUsername to UniqueAccountList
qiuhaohao bf8d0b7
Fixed constrain
qiuhaohao 6406061
Update test
qiuhaohao 67dfe71
Merge pull request #38 from CS2103JAN2018-T16-B1/unique-username
qiuhaohao 15f39c7
Updated test cases and files to fit catalogue
khiayi 2d43471
Updated UserGuide and examples of add,edit and find commands
khiayi 20b81d9
Fixed checkstyles
khiayi da2ef87
changed names of members contribution files
khiayi d1c5eb8
Merge pull request #13 from CS2103JAN2018-T16-B1/Dev_Guide
khiayi 79d3094
Revert "Update Dev Guide for the project contribution"
khiayi a630f8f
Merge pull request #40 from CS2103JAN2018-T16-B1/revert-13-Dev_Guide
khiayi ad42785
Merge pull request #39 from CS2103JAN2018-T16-B1/masterbranch
khiayi 7bb3290
Create clearAccountCommand
victortardieu 39a64cc
Modify UserGuide for the clearAccount command
victortardieu 1d21e3b
Update the User Guide for the Borrow Command
victortardieu 8280805
Set up goodreads page and set useragent
qiuhaohao 911205a
Fix style
qiuhaohao ccef3fb
Modify User Guide for ReturnCommand
victortardieu e745cab
Added Photo for Tiong Ley
chantiongley 053eb74
Merge pull request #47 from CS2103JAN2018-T16-B1/UserGuide_ReturnCommand
victortardieu edfae64
Merge pull request #45 from CS2103JAN2018-T16-B1/UserGuide_Clear
victortardieu d2cee78
Merge pull request #48 from chantiongley/tiong_pic
chantiongley 5d5e989
Merge branch 'master' into UserGuide_BorrowCommand
victortardieu 94d3947
Merge pull request #46 from CS2103JAN2018-T16-B1/UserGuide_BorrowCommand
victortardieu c9e9497
Fix system tests
qiuhaohao cdfaade
Fix style
qiuhaohao 258d2fb
Merge pull request #43 from CS2103JAN2018-T16-B1/change-search-page
qiuhaohao 4ca3700
Update UserGuide.adoc
qiuhaohao b65dac5
Update UserGuide.adoc
qiuhaohao 0f62eb5
Update UserGuide.adoc
qiuhaohao 60a094e
Removed trailing whitespace
qiuhaohao 88b2cb5
Collate for pull request #14: Add login
qiuhaohao 32cb2fe
Collate for pull request #31: Account list
qiuhaohao 9f6ae9c
Corrected annotations
qiuhaohao ed508d0
Add collation file
qiuhaohao 769c2ec
Change the color of the book tags
victortardieu 6ec4077
Create auto complete for books commands
victortardieu 0f7ab27
Merge pull request #7 from CS2103JAN2018-T16-B1/master
chantiongley 8357a11
Modify the intoduction of User Guide to make it about Catalogue
victortardieu 939e0f0
Update Quick Start section of User Guide to make it about Catalogue
victortardieu a9f6ba2
Change UserGuide according to issues in Login, Logout, Find
victortardieu 282ce14
Merge pull request #93 from CS2103JAN2018-T16-B1/Introduction_UserGuide
victortardieu bac0ddd
Merge pull request #94 from CS2103JAN2018-T16-B1/UserGuide_QuickStart
victortardieu 01a93b5
Merge pull request #96 from CS2103JAN2018-T16-B1/FeaturesFromIssues
victortardieu 9ff53da
Tag names can have whitespaces, solved issue
victortardieu d3ebb7b
Finish UI to randomly change tag color
victortardieu c9b2f1f
Change boundary value for randomly generated number
victortardieu 90a6d7f
Allow everyone to close the software using the exit command
victortardieu 585e559
Change ivory color to pink color
victortardieu 6849b6c
Merge pull request #100 from CS2103JAN2018-T16-B1/ExitForGuest
victortardieu 571bf38
Merge pull request #98 from CS2103JAN2018-T16-B1/TagWhiteSpace
victortardieu c02113a
Create autocompletion for Book Commands
victortardieu 11328b8
Fix check style
victortardieu 190766f
Fix Travis
victortardieu 031994e
Change colors
victortardieu 35a868e
Fix Travis
victortardieu 0016be0
Fix Travis 2
victortardieu f1a11fe
Fix Travis 3
victortardieu 8bf3415
Fix Travis 4
victortardieu b3cad13
Fix Travis 5
victortardieu 16f5ea5
Fix Travis 6
victortardieu 7c62f1f
Fix Travis 7
victortardieu 51d9b70
Collated for khiayi
khiayi 3b05589
Changed app name to Catalogue App
khiayi 94e8c57
Merge pull request #103 from CS2103JAN2018-T16-B1/userGuideUpdate
khiayi 7df618b
Change default case to leave as it is
victortardieu be0a5c1
Changed to match ISBN number for new books
chantiongley fe178ae
Fix failing test
victortardieu b2fbea3
Merge pull request #102 from CS2103JAN2018-T16-B1/autocomplete
victortardieu 3dda34c
Merge pull request #101 from CS2103JAN2018-T16-B1/colorTags
victortardieu b1c9f0c
Fix Checkstyle and AddCommandIntegrationTest
chantiongley 8b76180
Fix Checkstyle
chantiongley 71132c2
Fix Checkstyle (again)
chantiongley 7a73ec8
Fix Checkstyle (Again and Again)
chantiongley d1e90bf
Fix Checkstyle (again x3)
chantiongley 1e5518e
Fix Checkstyle (again x4)
chantiongley 936ba1f
Fix Checkstyle (again x5)
chantiongley c3cb5c1
Fix Checkstyle (again x6)
chantiongley 3bd297c
Fix Checkstyle (again x7)
chantiongley 6ce6d40
Fix Checkstyle (again x7)
chantiongley 5a82338
Fix Checkstyle (again x8)
chantiongley dade556
Fix Checkstyle (again x9)
chantiongley 185a22c
Merge pull request #104 from chantiongley/master
chantiongley 210c47d
Updated ALL tests + changed ISBN requirements to 13digits only
khiayi 2484258
Collated code for khiayi
khiayi 836f132
Merge branch 'master' into userGuideUpdate
khiayi f3d3c34
Add AddAccount command
qiuhaohao 16eacda
Start ClearAccountCommand tests
victortardieu 28055f1
Continue tests for ClearAccount
victortardieu 835d280
Updated and added tests for AddCommandSystemTest for unique ISBN
khiayi 482362a
Merge pull request #108 from CS2103JAN2018-T16-B1/userGuideUpdate
khiayi e36e0db
Continue tests creation for ClearAccount
victortardieu 0d64e17
Modify files for test creation
victortardieu 0e29d66
Modify UserGuide
victortardieu 1bdf907
Merge pull request #115 from CS2103JAN2018-T16-B1/userGuide12/04
victortardieu bee0fbd
Fix Style
qiuhaohao 16bbb4d
Add toString to Account
qiuhaohao 4d27bdb
Fixed part of test
qiuhaohao 7fc3ffb
Fix test style
qiuhaohao 4dce108
Merge pull request #116 from CS2103JAN2018-T16-B1/_addAccount
qiuhaohao cc5cb33
Finish writing tests for ClearAccount
victortardieu d060b97
Merge branch 'AddClearVictor' into ClearAccount_command
victortardieu 7f0b417
Merge pull request #117 from CS2103JAN2018-T16-B1/ClearAccount_command
victortardieu c942815
Finish tests for ClearAccount, change UserGuide, Modify prefixes for …
victortardieu 9c0da5e
Fix Travis 1
victortardieu cc0d18a
Merge pull request #11 from CS2103JAN2018-T16-B1/master
chantiongley f751ee5
Add no internet page
qiuhaohao d7135c4
Display no internet page when not connected
qiuhaohao b42e41c
Fix Travis 2
victortardieu b8d2c10
Fix style
qiuhaohao 60f28d7
Fix Travis 3
victortardieu 66802b2
Merge pull request #119 from CS2103JAN2018-T16-B1/noInternet-default
qiuhaohao 6299094
Fix Travis 4
victortardieu 7e69040
Collate Khiayi
khiayi 1f4bbca
Fix Travis 5
victortardieu ecc4f31
Updated UserGuide
khiayi ddd6176
Fix Travis 6
victortardieu 5938171
Created PPP for Tiong and Lucas
chantiongley 3119455
Merge pull request #121 from chantiongley/Collation
chantiongley 91fd11d
Merge pull request #118 from CS2103JAN2018-T16-B1/AddClearVictor
victortardieu 83c2ce1
Add PPP
qiuhaohao 0e403f1
Merge pull request #122 from CS2103JAN2018-T16-B1/TiongCollation_1
chantiongley 3fc57c4
Merge pull request #123 from CS2103JAN2018-T16-B1/haozePPP
qiuhaohao 075d3a3
PortFolio Victor
victortardieu 4dbe9a4
Merge pull request #124 from CS2103JAN2018-T16-B1/PortFolioVictor
victortardieu 2a2d27c
Merge pull request #120 from CS2103JAN2018-T16-B1/PersonalPortfolio
khiayi 5d637d1
Add Borrow, Return, Reserve Commands without tests and fix some check…
LeKhangTai 87135fb
Merge pull request #12 from CS2103JAN2018-T16-B1/addAccountTests
chantiongley d971200
Add addAccountCommandTest and adjusted AccountBuilder
chantiongley 3a7033a
Modify PortFolioVictor
victortardieu 356e9ac
Add AddAccountCommandIntegrationTest
chantiongley 3a4e0e6
Fix Checkstyle
chantiongley 6242994
Fix Checkstyle 2
chantiongley 117764c
Fix Checkstyle 3
chantiongley 0c715e1
Merge pull request #127 from chantiongley/addAccountCommandIntegratio…
chantiongley e698319
Merge pull request #128 from CS2103JAN2018-T16-B1/addAccountTest
chantiongley 7d9cd19
Merge pull request #14 from CS2103JAN2018-T16-B1/master
chantiongley 35ad6b0
Created DeleteAccount
chantiongley 8de2499
Updated DeleteAccountCommand
chantiongley e02d0cc
Updated AddCommandTest and AddAccountCommandTest
chantiongley 2b83404
Fix Checkstyle
chantiongley 417fa2f
Merge pull request #130 from chantiongley/master
chantiongley 5bbb7e5
Added BorrowCommand Tests
LeKhangTai 73d755e
Created ReturnCommand Test and BorrowCommand Test
LeKhangTai 48f6afa
Fix Exception Error in DeleteAccount
victortardieu 82a46f4
Start test for DeleteAccount
victortardieu db2b0d1
Continue writing tests for DeleteAccount
victortardieu cd6fb40
Add ReserveCommand Tests
LeKhangTai 97cf324
Fixed checkstyle
LeKhangTai b05ac3f
Merge branch '14thAprilAlpha' into BorrowReturnReserve
LeKhangTai a7f9a14
Merge pull request #132 from LeKhangTai/BorrowReturnReserve
LeKhangTai b47437e
Merge pull request #1 from CS2103JAN2018-T16-B1/14thAprilAlpha
LeKhangTai bbf6141
Test for DeleteAccoutCommand and parser
victortardieu b951398
Fix CheckStyle
LeKhangTai febd03f
Merge pull request #133 from LeKhangTai/14th-April
LeKhangTai dcc7de7
Merge pull request #134 from CS2103JAN2018-T16-B1/deleteAccount_withbugs
victortardieu 48ce416
Merge pull request #135 from CS2103JAN2018-T16-B1/14thAprilAlpha
victortardieu 5956790
Update Storage diagram
qiuhaohao 5b2d52c
Update storage related docs
qiuhaohao 496ed5c
Updated Appendix D in devGuide
qiuhaohao 367b9ad
Update Appendix D and H of DevGuide
qiuhaohao 10ab17c
Merge pull request #136 from CS2103JAN2018-T16-B1/storage-diagram
qiuhaohao 87a5b7c
Merge pull request #16 from CS2103JAN2018-T16-B1/master
chantiongley 779481b
Updated Model Class diagram and links in 2.4 and 6.5 in DeveloperGuide
khiayi 90781db
Added new UI image and updated README link
khiayi fa63fce
Change User Guide for ClearAccount and some minor issues
victortardieu 053d83b
Merge pull request #139 from CS2103JAN2018-T16-B1/UserGuideVictor
victortardieu 21fe19b
Added Collation tags
chantiongley 419e666
Merge pull request #138 from CS2103JAN2018-T16-B1/Documentation_Khiayi
khiayi d9760a9
Updated Command Summary and ModelClassDiagram
khiayi 17d3649
Updated ModelClassDiagram
khiayi 5600b37
Updated ModelClassDiagram 3
khiayi 788462a
Reordered commands in command summary in userguide
khiayi f3c3da1
Added use case for Add Edit Help Select
khiayi f071d66
Removed 'Borrowed and Reserved'.
khiayi f1927fe
Merge pull request #4 from CS2103JAN2018-T16-B1/Lucas's-Last-Branch
LeKhangTai 812c73c
Modify the DevGuide: Section 2.2, Appendix B, Appendix C, AppendixD, …
victortardieu edca8c6
Added manual test and use case for add edit help select
khiayi 0841ca4
Modify App Icon
victortardieu 8ac25e1
Re: Updates for DevGuide, UserGuide, Diagrams, Images, LeKhangTai.ado…
LeKhangTai 52da16f
Fixed Indentation x2
LeKhangTai 2f4763f
Merge pull request #142 from LeKhangTai/Lucas's-Last-Branch
LeKhangTai 42282fe
Merge pull request #143 from CS2103JAN2018-T16-B1/Lucas's-Last-Branch
LeKhangTai a31f3df
Updated UserGuide for Add Edit Help Select
khiayi 58338ca
Personal Portfolio for Khiayi
khiayi 034f971
Collated
khiayi 153a787
Merge branch 'master' into Documentation_Khiayi3
khiayi 5023d5b
Updated UI.png
khiayi fce2ca1
Merge branch 'Documentation_Khiayi3' of https://github.com/CS2103JAN2…
khiayi a4a17a4
Reorder command summary
khiayi 363fdd9
Renumbered in edit
khiayi de0e624
changed ui_1.png
khiayi 268347c
Merge pull request #145 from CS2103JAN2018-T16-B1/Documentation_Khiayi3
khiayi e2815ed
Updated Developer Guide and Diagrams and pptx Files
chantiongley d91660e
Continue PortFolio
victortardieu 3c6313d
Updated UserGuide
chantiongley 746db5f
Merge branch 'master' into DevelopergGuideByVictor
victortardieu f7b4c21
Add contribution to UserGuide
victortardieu 59c0b36
Contribution 2
victortardieu eec5456
Add autocomplete for account commands
victortardieu 0f9d159
Merge pull request #147 from CS2103JAN2018-T16-B1/UserGuideByVictor2
victortardieu b34aeeb
Updated PPP
chantiongley 9214a8e
Reverted LogicComponent pptx
chantiongley f1c3c86
Continue PortFolio
victortardieu fd80ad2
Merge branch 'master' into master
chantiongley 4bcdbbe
Remove select
victortardieu c73117d
Merge branch 'master' into PortFolioVictor2
victortardieu 598c697
Merge pull request #149 from chantiongley/master
chantiongley 38673c4
Fix Travis
victortardieu 9d26893
Merge pull request #150 from CS2103JAN2018-T16-B1/PortFolioVictor2
khiayi 40f21d6
Merge pull request #148 from CS2103JAN2018-T16-B1/AutoCompleteAccount
khiayi 07c90ee
Revert "Add autocomplete for account commands"
khiayi d2b9a7b
Merge pull request #151 from CS2103JAN2018-T16-B1/revert-148-AutoComp…
khiayi 64f2af0
Merge branch 'master' into DevelopergGuideByVictor
victortardieu b3fc875
Merge pull request #146 from CS2103JAN2018-T16-B1/DevelopergGuideByVi…
victortardieu 60b7d30
Review documentation 1
khiayi 17eb9a2
Collate for victor
khiayi da07ec1
Merge pull request #152 from CS2103JAN2018-T16-B1/Final_changes
khiayi 6bf6cc5
Documentation 2
khiayi b8429a8
Merge pull request #154 from CS2103JAN2018-T16-B1/Final_changes
LeKhangTai 5f1a656
Delete collation
qiuhaohao c3c8cb7
Changed collation
qiuhaohao efb3576
Add collation
qiuhaohao d43136f
Merge pull request #155 from CS2103JAN2018-T16-B1/change-collate
qiuhaohao 45aeb7d
Modify UG + DG, final checks
victortardieu dc0de00
Merge pull request #156 from CS2103JAN2018-T16-B1/UserGuideAuto
victortardieu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
= Contact Us | ||
:stylesDir: stylesheets | ||
|
||
* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level4/issues[issue tracker] if you noticed bugs or have suggestions on how to improve. | ||
* *Bug reports, Suggestions* : Post in our https://github.com/CS2103JAN2018-T16-B1/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve. | ||
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here] | ||
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please format this properly or remove it if it is unncessary