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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ MIT License

Copyright (c) 2016 Software Engineering Education - FOSS Resources

Permission is hereby granted, free of charge, to any person obtaining a copy
Permission is hereby granted, free of charge, to any book obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
copies of the Software, and to permit books to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
Expand Down
26 changes: 9 additions & 17 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,38 +1,30 @@
= Address Book (Level 4)
= Catalogue
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
https://travis-ci.org/CS2103JAN2018-T16-B1/main[image:https://travis-ci.org/CS2103JAN2018-T16-B1/main.svg?branch=master[Build Status]]
https://coveralls.io/github/CS2103JAN2018-T16-B1/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-T16-B1/main/badge.svg?branch=master[Coverage Status]]


ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
image::docs/images/Ui_1.png[width="600"]
endif::[]

ifndef::env-github[]
image::images/Ui.png[width="600"]
image::images/Ui_1.png[width="600"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
** A more sophisticated GUI that includes a list panel and an in-built Browser.
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
* This is a desktop Catalogue application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java application intended for librarians, students and guests using the library.

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

== Acknowledgements

* This sample application is adapted from https://github.com/se-edu/[se-edu].
* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://github.com/TomasMikula/EasyBind[EasyBind], https://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit4[JUnit4]
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ dependencies {
}

shadowJar {
archiveName = "addressbook.jar"
archiveName = "catalogue.jar"

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -127,8 +127,8 @@ test {
boolean runNonGuiTests = gradle.taskGraph.hasTask(nonGuiTests)

if (!runGuiTests && !runNonGuiTests) {
runGuiTests = true;
runNonGuiTests = true;
runGuiTests = true
runNonGuiTests = true
}

if (runNonGuiTests) {
Expand Down
Loading