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.5][F12-B3] Media Socializer #88

Open
wants to merge 416 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
416 commits
Select commit Hold shift + click to select a range
f0f4e5c
Update custom person creation parameters to hard-coded values
Nethergale Mar 30, 2018
caa2a73
Update xml files for XmlUtilTest
Nethergale Mar 30, 2018
cbeda3d
Update user guide and app title in config file
Nethergale Apr 3, 2018
7906387
Re-add config.json to gitignore
Nethergale Apr 3, 2018
763369d
Fix formatting in user guide
Nethergale Apr 3, 2018
dd9c752
Fix listing format in user guide
Nethergale Apr 3, 2018
7dc07ea
Test fixing format in user guide
Nethergale Apr 3, 2018
b8bb6f2
Test fixing auto links in user guide
Nethergale Apr 3, 2018
b4a760c
Test fixing auto links in user guide
Nethergale Apr 3, 2018
bdaa388
Test fixing auto links in user guide
Nethergale Apr 3, 2018
cabaf2e
Test fixing auto links in user guide
Nethergale Apr 3, 2018
070ed19
Test fixing auto links in user guide
Nethergale Apr 3, 2018
6eb5c1d
Test fixing auto links in user guide
Nethergale Apr 3, 2018
375646b
Test fixing auto links in user guide
Nethergale Apr 3, 2018
6effc7f
Test fixing auto links in user guide
Nethergale Apr 3, 2018
353a6a8
Test using table
Nethergale Apr 3, 2018
6c419b5
Test formatting using table
Nethergale Apr 3, 2018
d719deb
Test formatting using table
Nethergale Apr 3, 2018
e4fafd3
Test formatting using table
Nethergale Apr 3, 2018
5b5cb5c
Test putting table into note
Nethergale Apr 3, 2018
21051d6
Format table in note
Nethergale Apr 3, 2018
ed8644b
Change formatting of table in note
Nethergale Apr 3, 2018
28e856c
Change formatting of table in note
Nethergale Apr 3, 2018
e4d6e19
Change attributes of table
Nethergale Apr 3, 2018
4d7b083
Change headers of table
Nethergale Apr 3, 2018
18cd4b4
Add test cases for add platform command parser
Nethergale Apr 3, 2018
cf0c188
Add new line to config file
Nethergale Apr 3, 2018
40a9b40
Remove config file from gitignore
Nethergale Apr 3, 2018
fbb3c12
Re-add config file to gitignore
Nethergale Apr 3, 2018
47fb286
Untrack config file
Nethergale Apr 3, 2018
e0a82db
Update application version and application name
Nethergale Apr 3, 2018
7c80b72
Update portfolio
Nethergale Apr 3, 2018
276c280
Add login() in Account
shadow2496 Apr 3, 2018
5dbf120
Add authorship for collate
Nethergale Apr 4, 2018
66f7a00
Merge pull request #87 from Nethergale/feature/manageSocialMediaPlatform
Nethergale Apr 4, 2018
cacbe23
BrowserPanel.fxml: Edit browser panel from a single Webview to 2 tabs…
KevinChuangCH Apr 4, 2018
f3820cf
BrowserPanel.java: Implementation of the browser in the 2nd tab. Dumm…
KevinChuangCH Apr 4, 2018
3009b27
BrowserPanel.java: Change the name of the constant to improve readabi…
KevinChuangCH Apr 4, 2018
0f106c5
BrowserPanelTest.java: Update the change of the constant name.
KevinChuangCH Apr 4, 2018
a260d38
AddressBookSystemTest.java: Update the change of the constant name.
KevinChuangCH Apr 4, 2018
c2091d5
BrowserPanel.java: Correct coding standard.
KevinChuangCH Apr 4, 2018
a47b284
BrowserPanelTest.java: Correct coding standard.
KevinChuangCH Apr 4, 2018
bd52c0d
AddressBookSystemTest.java: Correct coding standard.
KevinChuangCH Apr 4, 2018
8f1940e
Merge pull request #90 from KevinChuangCH/UI
KevinChuangCH Apr 4, 2018
1c14032
Add loginAccount() in AddressBook
shadow2496 Apr 4, 2018
5fa69d9
Add implementation of remove platform command
Nethergale Apr 4, 2018
2682253
Fix checkstyle errors
Nethergale Apr 4, 2018
4ba9a14
Update LoginCommand.execute() to generate the login dialog url
shadow2496 Apr 4, 2018
eabdeca
Add test case to address book parser for remove platform command
Nethergale Apr 4, 2018
ddf1820
Add test cases for remove platform command parser
Nethergale Apr 5, 2018
e703cee
SearchAllCommand.java: Create SearchAllCommand Class, no implementati…
KevinChuangCH Apr 5, 2018
0601bb5
SearchAllCommand.java: Add implementation of SearchAllCommand, now th…
KevinChuangCH Apr 5, 2018
abf1acd
SearchAllCommandParser.java: Create new SearchAllCommandParser class,…
KevinChuangCH Apr 5, 2018
4cf4c02
SearchAllCommandParser.java: Add implementation of SearchAllCommandPa…
KevinChuangCH Apr 5, 2018
4d411da
AddressBookParser.java: Add the case for SearchAllCommand in the pars…
KevinChuangCH Apr 5, 2018
3749fa2
Add test cases for remove platform command
Nethergale Apr 5, 2018
4a107a0
Fix checkstyle errors
Nethergale Apr 5, 2018
e8bd5d7
Merge pull request #91 from Nethergale/feature/manageSocialMediaPlatform
Nethergale Apr 5, 2018
0ab95a6
Update SampleDataUtil persons, BrowserPanel urls and BrowserPanelTest
Nethergale Apr 5, 2018
4acff4b
Add collated code files
Nethergale Apr 5, 2018
9b35445
SearchPersonOnAllPlatformEvent.java: Create new SearchPersonOnAllPlat…
KevinChuangCH Apr 5, 2018
8a2a861
SearchAllCommand.java: Implement the actual Implementation of the Sea…
KevinChuangCH Apr 5, 2018
f37f698
SearchAllCommandParser.java: Implement the actual implementation of S…
KevinChuangCH Apr 5, 2018
3799ed0
ParserUtil.java: Add parseSearchName method to check for the validati…
KevinChuangCH Apr 5, 2018
6d13fe4
Merge pull request #96 from Nethergale/master
Nethergale Apr 5, 2018
9fa268c
BrowserPanel.java: Add new handleSearchPersonOnAllPlatformEvent to ha…
KevinChuangCH Apr 5, 2018
7f1b4f3
Change image of ui for readme
Nethergale Apr 5, 2018
8fcafe3
Merge branch 'master' into SearchOnSocialMedia
KevinChuangCH Apr 5, 2018
d5326ee
Merge pull request #98 from Nethergale/master
Nethergale Apr 5, 2018
c4db5ac
SearchPersonOnAllPlatformEvent.java: Correct coding standard error.
KevinChuangCH Apr 5, 2018
840eca0
SearchAllCommandParser.java: Correct coding standard error, remove un…
KevinChuangCH Apr 5, 2018
6a2e23b
Merge branch 'SearchOnSocialMedia'
KevinChuangCH Apr 5, 2018
458c794
SearchAllCommandParser.java: Correct coding standard error, remove un…
KevinChuangCH Apr 5, 2018
648b60a
SearchPersonOnAllPlatformEvent.java: Correct coding standard error, a…
KevinChuangCH Apr 5, 2018
5892913
Merge pull request #97 from KevinChuangCH/SearchOnSocialMedia
KevinChuangCH Apr 5, 2018
5c62ae3
Merge branch 'master' of https://github.com/CS2103JAN2018-F12-B3/main
KevinChuangCH Apr 5, 2018
5125eb2
Add ShowLoginDialogRequestEvent
shadow2496 Apr 5, 2018
97defc4
SearchFacebookCommand.javac: Create SearchFacebookCommand class, no i…
KevinChuangCH Apr 6, 2018
5ee9d8d
SearchFacebookCommand.java: Add implementation of SearchFacebookComma…
KevinChuangCH Apr 6, 2018
c96fce0
SearchFacebookCommandParser.java: Create new SearchFacebookCommandPar…
KevinChuangCH Apr 6, 2018
d0b8655
SearchFacebookCommandParser.java: Add implementation of SearchFaceboo…
KevinChuangCH Apr 6, 2018
ae4f928
AddressBookParser.java: Add the case for SearchFacebookCommand in the…
KevinChuangCH Apr 6, 2018
ec7de93
SearchPersonOnAllPlatformEvent.java: Create new SearchPersonOnAllPlat…
KevinChuangCH Apr 6, 2018
4ab53d8
Update user guide and collate code files of group
Nethergale Apr 6, 2018
accc7fd
SearchFacebookCommand.java: Implement the actual Implementation of th…
KevinChuangCH Apr 6, 2018
77c5aa7
BrowserPanel.java: Add new handleSearchPersonOnFacebookEvent to handl…
KevinChuangCH Apr 6, 2018
923cf91
SearchFacebookCommand.java: Correct MESSAGE_SEARCH_PERSON_SUCCESS, ad…
KevinChuangCH Apr 6, 2018
2dd3141
SearchFacebookCommandParser.java: Add author.
KevinChuangCH Apr 6, 2018
e58eacc
SearchPersonOnFacebookEvent.java: Add author.
KevinChuangCH Apr 6, 2018
9e6ce7f
SearchFacebookCommand.java: Add author.
KevinChuangCH Apr 6, 2018
7fb8c37
SearchTwitterCommand.java: Create SearchTwitterCommand class, no impl…
KevinChuangCH Apr 6, 2018
55e5dee
SearchTwitterCommandParser.java: Create new SearchTwitterCommandParse…
KevinChuangCH Apr 6, 2018
cf295bc
Add passVerificationCode() in BrowserPanel
shadow2496 Apr 6, 2018
b6bbb8f
SearchPersonOnTwitterEvent.java: Create new SearchPersonOnTwitterEven…
KevinChuangCH Apr 6, 2018
2149402
SearchTwitterCommand.java: Implement the SearchTwitterCommand class.
KevinChuangCH Apr 6, 2018
963eaf4
AddressBookParser.java: Add the case for SearchTwitterCommand in the …
KevinChuangCH Apr 6, 2018
552f965
BrowserPanel.java: Add new handleSearchPersonOnTwitterEvent to handle…
KevinChuangCH Apr 6, 2018
d5ebac4
Merge pull request #100 from KevinChuangCH/SearchOnFacebook
KevinChuangCH Apr 6, 2018
249f730
Merge branch 'master' into SearchOnTwitter
KevinChuangCH Apr 6, 2018
ca60390
Update AddressBookParser.java
KevinChuangCH Apr 6, 2018
ac97fe0
Update BrowserPanel.java
KevinChuangCH Apr 6, 2018
e92bd1c
Merge pull request #101 from KevinChuangCH/SearchOnTwitter
KevinChuangCH Apr 6, 2018
009d090
Update Logic, Model to pass the verification code to Account
shadow2496 Apr 6, 2018
12ef10f
Merge pull request #99 from Nethergale/master
KevinChuangCH Apr 6, 2018
b75355e
Merge branch 'master' into feature/model/login_facebook
shadow2496 Apr 6, 2018
c71ffa5
Update the version to v1.4
shadow2496 Apr 6, 2018
5a2b532
Merge pull request #103 from shadow2496/setup/v1.4
shadow2496 Apr 6, 2018
be7db89
UserGuide.adoc: Update the User Guide to inlcude the 3 newly implemen…
KevinChuangCH Apr 6, 2018
62c9752
UserGuide.adoc: Update User Guide to include information about the us…
KevinChuangCH Apr 6, 2018
8cdb246
UserGuide: update the login command feature
shadow2496 Apr 6, 2018
37846e9
Merge pull request #104 from KevinChuangCH/UserGuideForPeerTesting
shadow2496 Apr 6, 2018
e2b210f
Remove MockUi.png
shadow2496 Apr 6, 2018
2671dd8
Merge pull request #105 from shadow2496/feature/docs/user
shadow2496 Apr 6, 2018
d31f075
Merge pull request #106 from shadow2496/feature/docs/readme
shadow2496 Apr 6, 2018
d8d8cdc
Update regex for facebook and twitter links
Nethergale Apr 9, 2018
5e07fd0
Fix checkstyle errors
Nethergale Apr 9, 2018
5b95a87
Merge pull request #114 from Nethergale/master
Nethergale Apr 9, 2018
699c84d
Update portfolio and developer guide for changes to feature contribution
Nethergale Apr 9, 2018
6962cd1
Make minor corrections to developer guide
Nethergale Apr 9, 2018
a0dbcd8
Make minor corrections to portfolio
Nethergale Apr 9, 2018
1ba99a7
SearchPersonEvent.java: Create new SearchPersonEvent class for abstra…
KevinChuangCH Apr 9, 2018
caf233a
SearchCommand.java: Create new SearchCommand class to replace SearchA…
KevinChuangCH Apr 11, 2018
636fe50
SearchCommandParser.java: Create new SearchCommandParser class to rep…
KevinChuangCH Apr 11, 2018
445564c
SearchPersonEvent.java: Implement the SearchPersonEvent
KevinChuangCH Apr 11, 2018
f4edd7c
BrowserPanel.java: Create new handleSearchPersonEvent method to repla…
KevinChuangCH Apr 11, 2018
b3ed594
SocialMediaPlatform.java: Add MESSAGE_PLATFORM_CONSTRAINTS and isVali…
KevinChuangCH Apr 11, 2018
a9c5762
Facebook.java: Add PLATFORM_KEYWORD and PLATFORM_ALIAS to be use in a…
KevinChuangCH Apr 11, 2018
10eb107
Twitter.java: Add PLATFORM_KEYWORD and PLATFORM_ALIAS to be use in a …
KevinChuangCH Apr 11, 2018
ab1d787
ParserUtil.java: Implement new parsePlatformToSearch method to check …
KevinChuangCH Apr 11, 2018
beb4c3e
AddressBookParser.java: Add the case for SearchCommand in the parseCo…
KevinChuangCH Apr 11, 2018
a607f55
SocialMediaPlatform.java: Remove extra blank line.
KevinChuangCH Apr 11, 2018
83bedba
SearchCommandParser.java: Correct mistake in comment.
KevinChuangCH Apr 11, 2018
9fbd088
Remove classes that are replaced by SearchCommand class, SearchComman…
KevinChuangCH Apr 11, 2018
81e111f
BrowserPanel.java: Remove unused methods and imports.
KevinChuangCH Apr 11, 2018
82d90c2
AddressBookParser.java: Remove cases that are replaced by SearchCommand.
KevinChuangCH Apr 11, 2018
60a8b66
SearchCommand.java: Edit COMMAND_WORD to prompt the user that PLATFOR…
KevinChuangCH Apr 11, 2018
48a7c2b
BrowserPanel.java: Correct coding style to follow the coding standard.
KevinChuangCH Apr 11, 2018
1a7db0a
SearchCommandParser.java: Correct coding style to follow the coding s…
KevinChuangCH Apr 11, 2018
c12d4d7
SocialMediaPlatform.java: Correct coding style to follow the coding s…
KevinChuangCH Apr 11, 2018
81a75f1
Merge pull request #117 from KevinChuangCH/AbstractSimilarCode
KevinChuangCH Apr 11, 2018
ad31b88
BrowserPanel.java: Abstract out common code.
KevinChuangCH Apr 11, 2018
c27956f
Merge pull request #123 from KevinChuangCH/AbstractSimilarCode
KevinChuangCH Apr 11, 2018
d7a0abb
Merge pull request #116 from Nethergale/master
Nethergale Apr 11, 2018
9530e10
images: Add pictures used in Developer Guide.
KevinChuangCH Apr 11, 2018
9fed818
DeveloperGuide.adoc: Minor update of Developer Guide.
KevinChuangCH Apr 11, 2018
a8fa0c7
chuangchengheng.adoc: Update personal portfolio.
KevinChuangCH Apr 11, 2018
066ab85
SocialMediaPlatform.java: Add USERNAME_VALIDATION_REGEX and MESSAGE_U…
KevinChuangCH Apr 11, 2018
2577f14
ParserUtil.java: Use USERNAME_VALIDATION_REGEX of SocialMediaPlatform…
KevinChuangCH Apr 11, 2018
f9f2173
SocialMediaPlatform.java: Correct coding style to follow the coding s…
KevinChuangCH Apr 11, 2018
708e89b
SocialMediaPlatform.java: Correct coding style to follow the coding s…
KevinChuangCH Apr 11, 2018
4b7d470
Merge pull request #124 from KevinChuangCH/CorrectUsernameCheck
KevinChuangCH Apr 11, 2018
3cb6643
Update BrowserPanel to show profiles of persons
Nethergale Apr 12, 2018
8ac1d3c
Change config files to correct application name
Nethergale Apr 12, 2018
62fc0d6
Merge branch 'master' of https://github.com/CS2103JAN2018-F12-B3/main…
Nethergale Apr 12, 2018
524e0cb
Fix checkstyle errors in browser panel
Nethergale Apr 12, 2018
00019cc
Remove whitespace line
Nethergale Apr 12, 2018
da84dd5
Add comments to methods for browser panel
Nethergale Apr 12, 2018
d4f2f4a
Change method names while refactoring usages
Nethergale Apr 12, 2018
73d9764
Make changes to typical persons
Nethergale Apr 12, 2018
1778b40
Merge pull request #126 from Nethergale/feature/manageSocialMediaPlat…
Nethergale Apr 12, 2018
7ec8a73
Make minor correction to user guide
Nethergale Apr 12, 2018
c926539
Add variable to browser panel
Nethergale Apr 12, 2018
68c0ddc
Remove syntax error
Nethergale Apr 12, 2018
2d1cbcc
Increase wait for event timeout
Nethergale Apr 12, 2018
1d74395
Edit typical persons and build.gradle
Nethergale Apr 12, 2018
8020989
Merge pull request #127 from Nethergale/feature/manageSocialMediaPlat…
Nethergale Apr 12, 2018
e457ded
Add new line
Nethergale Apr 12, 2018
701161a
Rewrite some code for testing of URLs
Nethergale Apr 12, 2018
ecd660f
Reduce wait timeout
Nethergale Apr 12, 2018
9638c59
Update travis.yml
Nethergale Apr 12, 2018
34bcc34
BrowserPanel.java: Included the feature of opening and closing tab in…
KevinChuangCH Apr 12, 2018
a0f90af
AddressBookSystemTest.java: Replace DUMMY_PROFILE_PAGE_URL with the d…
KevinChuangCH Apr 12, 2018
2160327
Merge pull request #128 from Nethergale/feature/manageSocialMediaPlat…
Nethergale Apr 12, 2018
343d359
Merge branch 'master' into UpdateSearchFeature
KevinChuangCH Apr 12, 2018
876d253
Update BrowserPanel.java
KevinChuangCH Apr 12, 2018
ee83fb0
.travis.yml: Attempt to fix Travis.
KevinChuangCH Apr 12, 2018
e453903
BrowserPanel.java: Fix coding style error.
KevinChuangCH Apr 12, 2018
947b3de
.travis.yml: Redo previous change.
KevinChuangCH Apr 12, 2018
fd254dd
AddressBookSystemTest.java: Fix coding style error, remove unused imp…
KevinChuangCH Apr 12, 2018
a3e45d4
Attempt to fix Travis.
KevinChuangCH Apr 12, 2018
990ef4b
BrowserPanel.java: Attempt to fix failing test cases on Travis.
KevinChuangCH Apr 12, 2018
a419da2
Attempt to fix failing test cases on Travis.
KevinChuangCH Apr 12, 2018
157bfe2
images: Add images used in Developer Guide
KevinChuangCH Apr 12, 2018
ca4f05f
UserGuide.adoc: Update User Guide.
KevinChuangCH Apr 12, 2018
c8762e3
DeveloperGuide.adoc: Update Developer Guide.
KevinChuangCH Apr 12, 2018
5c594d3
images: Add new images used in Developer Guide
KevinChuangCH Apr 12, 2018
b6f0faf
DeveloperGuide.adoc: Minor update, included screen shot of the applic…
KevinChuangCH Apr 12, 2018
b97f56c
images: Add images used in Developer Guide.
KevinChuangCH Apr 12, 2018
4bbdfa7
DeveloperGuide.adoc: Update Developer Guide.
KevinChuangCH Apr 12, 2018
b1202e3
BrowserPanel.java: Replace dummy search page with actual search URL.
KevinChuangCH Apr 12, 2018
a6275e4
DeveloperGuide.adoc: Remove extra blank line.
KevinChuangCH Apr 12, 2018
a5b7525
UserGuide.adoc: Add tags to the section I have written.
KevinChuangCH Apr 12, 2018
c7d4278
chuangchengheng.adoc: Update the contrivbution to User Guide and Deve…
KevinChuangCH Apr 12, 2018
9242677
Introduce stop-gap measure for inconsistent test case
Nethergale Apr 13, 2018
1945a82
Remove unused imports
Nethergale Apr 13, 2018
534d71b
Remove unused import
Nethergale Apr 13, 2018
22bfca5
Merge pull request #131 from Nethergale/feature/manageSocialMediaPlat…
Nethergale Apr 13, 2018
68e8334
Merge pull request #130 from KevinChuangCH/Documentation
Nethergale Apr 13, 2018
a432156
Merge pull request #129 from KevinChuangCH/UpdateSearchFeature
Nethergale Apr 13, 2018
6e3630d
Update documentation
KevinChuangCH Apr 13, 2018
b52936b
DeveloperGuide.java: Correct mistake in title of the section.
KevinChuangCH Apr 13, 2018
8bf0a71
Add dummy profile page url
Nethergale Apr 13, 2018
cf4746f
Merge pull request #134 from Nethergale/master
Nethergale Apr 13, 2018
30a2f76
Add import of BrowserPanel
Nethergale Apr 13, 2018
21159e5
Allow test to execute get loaded URL
Nethergale Apr 13, 2018
e624788
Allow test to get mappings of social media platform
Nethergale Apr 13, 2018
cd7d693
Remove expectedUrl assignment to actualUrl
Nethergale Apr 13, 2018
ea0b3ad
Replace dummy page with default page
Nethergale Apr 13, 2018
9710740
Remove unused import
Nethergale Apr 13, 2018
e4a41a9
Remove unused variable in BrowserPanel
Nethergale Apr 13, 2018
b396105
Merge pull request #133 from KevinChuangCH/Documentation
KevinChuangCH Apr 13, 2018
2d72638
ParserUtil.java: Add author for collate.
KevinChuangCH Apr 13, 2018
4665d31
Person.java: Add author for collate.
KevinChuangCH Apr 13, 2018
03b06a6
Add author for collate.
KevinChuangCH Apr 13, 2018
be63641
UniqueTagList.java: Add author for collate.
KevinChuangCH Apr 13, 2018
3f62204
chuangchengheng.adoc: Add link to collate files.
KevinChuangCH Apr 13, 2018
c09db3a
Merge pull request #137 from KevinChuangCH/Documentation
KevinChuangCH Apr 13, 2018
e72b761
Merge pull request #138 from KevinChuangCH/Collate
KevinChuangCH Apr 13, 2018
4857d84
Remove unused parameter for getExpectedUrl
Nethergale Apr 13, 2018
e21f764
Remove unused variable in AddressBookSystemTest
Nethergale Apr 13, 2018
28ddafb
Make minor change as commit
Nethergale Apr 13, 2018
0deea0f
Revert changes to parseUrl
Nethergale Apr 13, 2018
4926177
Merge pull request #136 from Nethergale/test/testingCI
Nethergale Apr 13, 2018
3814cd2
Add important note to add platform command of user guide
Nethergale Apr 13, 2018
ff81520
Add important note icon
Nethergale Apr 13, 2018
54149bf
Update developer guide for add platform command
Nethergale Apr 14, 2018
95168fc
Add more content to developer guide for add platform command
Nethergale Apr 14, 2018
2b6aac4
Make minor corrections to developer guide and portfolio
Nethergale Apr 14, 2018
3ca6e1a
Merge pull request #139 from Nethergale/feature/docs/developerGuide
Nethergale Apr 14, 2018
15c0195
Add test case for search command to address book parser test
Nethergale Apr 14, 2018
c22549a
Add test case for add command alias
Nethergale Apr 14, 2018
757e95c
Add test cases for search command parser
Nethergale Apr 14, 2018
b631355
Fix checkstyle errors
Nethergale Apr 14, 2018
77452c8
Add various test cases for search command parser
Nethergale Apr 14, 2018
31adb4c
Add one more test for search command parser
Nethergale Apr 14, 2018
531f731
Merge pull request #140 from Nethergale/test/coverageImprovements
Nethergale Apr 14, 2018
e609005
Add collate files for group
Nethergale Apr 14, 2018
ba5dd06
Merge pull request #141 from Nethergale/feature/docs/collate
Nethergale Apr 14, 2018
392b6bf
Change version to v1.5
Nethergale Apr 15, 2018
a6d5ea9
Update image file path for github io
Nethergale Apr 15, 2018
b09799d
Update sequence diagram image with less spacing
Nethergale Apr 15, 2018
2484b93
Add paragraph on data encryption
Nethergale Apr 15, 2018
83a3123
Fix merge conflicts
shadow2496 Apr 15, 2018
cefd37f
Merge branch 'master' into feature/model/login_facebook
shadow2496 Apr 15, 2018
1992fb1
Merge pull request #102 from shadow2496/feature/model/login_facebook
shadow2496 Apr 15, 2018
e1b14c9
Add annotations for collate
shadow2496 Apr 15, 2018
104ac91
Add collated files
shadow2496 Apr 15, 2018
e71c3f7
Merge pull request #143 from shadow2496/collate/shadow2496
shadow2496 Apr 15, 2018
d483bbb
Merge branch 'master' of https://github.com/CS2103JAN2018-F12-B3/main…
Nethergale Apr 15, 2018
b026f7b
Merge pull request #142 from Nethergale/feature/releasePreparation
Nethergale Apr 15, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ matrix:

script: >-
./config/travis/run-checks.sh &&
travis_retry ./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor copyDummySearchPage
travis_retry ./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor copyDummySearchPage copyLoadingPage

deploy:
skip_cleanup: true
Expand Down
26 changes: 13 additions & 13 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
= Address Book (Level 4)
= Media Socializer
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://travis-ci.org/CS2103JAN2018-F12-B3/main[image:https://travis-ci.org/CS2103JAN2018-F12-B3/main.svg?branch=master[Build Status]]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good.

https://ci.appveyor.com/project/shadow2496/main[image:https://ci.appveyor.com/api/projects/status/qe3vke3edgqhmxsj?svg=true[Build status]]
https://coveralls.io/github/CS2103JAN2018-F12-B3/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-F12-B3/main/badge.svg?branch=master[Coverage Status]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]

ifdef::env-github[]
Expand All @@ -15,26 +14,27 @@ ifndef::env-github[]
image::images/Ui.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.
== For All Your Social Media Needs

Media Socializer aims to provide you with one-stop access to your favourite social media platforms.
It keeps track of the various platforms your friends are using and sends you straight to their page if you so desire.
You can also store them as contacts in case you need to communicate with them offline.
Check out the social feeds of different people on multiple platforms all in a single window!

*Go on, grab the app and get started now!*

== Site Map

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

== Acknowledgements

* 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_.
* The AddressBook-Level4 project was created by the https://github.com/se-edu/[SE-EDU] initiative.
* 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]

== Licence : link:LICENSE[MIT]
8 changes: 7 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ dependencies {
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
compile group: 'com.google.guava', name: 'guava', version: '19.0'
compile group: 'com.restfb', name: 'restfb', version: '2.3.0'

testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.testfx', name: 'testfx-core', version: testFxVersion
Expand All @@ -57,7 +58,7 @@ dependencies {
}

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

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -201,6 +202,11 @@ task copyDummySearchPage(type: Copy) {
into "${buildDir}/docs/html5"
}

task copyLoadingPage(type: Copy) {
from 'docs/LoadingPage.html'
into "${buildDir}/docs/html5"
}

deployOfflineDocs.dependsOn asciidoctor
processResources.dependsOn deployOfflineDocs

Expand Down
Loading