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.

Sign up for GitHub

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.0][W15-B1] E.T. (Employees Tracker) #43

Open
wants to merge 874 commits into
base: master
Choose a base branch
from
+28,288 −2,084
Open

[v1.0][W15-B1] E.T. (Employees Tracker) #43

Show file tree
Hide file tree
Changes from 93 commits
Commits
Show all changes
874 commits
Select commit Hold shift + click to select a range
60104a5
update background colour of list-view and status-bar
Yoochard Apr 9, 2018
c93367e
Merge branch 'master' of https://github.com/CS2103JAN2018-W15-B1/main
Yoochard Apr 9, 2018
8594271
change filled text to reduce warning when ui starts
Yoochard Apr 9, 2018
0ee7969
make add photo commmand undoable
crizyli Apr 10, 2018
8afdb30
junit tests
crizyli Apr 10, 2018
9de2037
junit tests
crizyli Apr 10, 2018
ca23c65
fix style error
crizyli Apr 10, 2018
abf8fc0
fix test error
crizyli Apr 10, 2018
432ab26
Merge pull request #201 from crizyli/make_undo
crizyli Apr 10, 2018
d1cbda9
update collate
crizyli Apr 10, 2018
369d300
update collate file
crizyli Apr 10, 2018
090ae85
Merge pull request #202 from crizyli/update_collate
crizyli Apr 10, 2018
797cd92
Merge branch 'master' of https://github.com/CS2103JAN2018-W15-B1/main
Yoochard Apr 10, 2018
5b57aac
Merge pull request #13 from CS2103JAN2018-W15-B1/master
IzHoBX Apr 10, 2018
3deb85b
update suggested commands usage
Yoochard Apr 10, 2018
1c1a7c2
fix the error that a black box will appear in Calendar when ET is locked
Yoochard Apr 10, 2018
5643a79
fix the error of black box on the left
Yoochard Apr 10, 2018
8e489ff
adjust colour
Yoochard Apr 10, 2018
4292c2e
Review: Add system test
emer7 Apr 10, 2018
f6b3861
Edit: Fix system test
emer7 Apr 10, 2018
7d039d9
Remove notification cards for deleted events
IzHoBX Apr 10, 2018
561a27b
Merge pull request #203 from Yoochard/master
Yoochard Apr 10, 2018
d1105e5
Change notification cards index to 1-based
IzHoBX Apr 10, 2018
1a5ee35
Person.java: Format toString for better look
emer7 Apr 10, 2018
7c046f1
update collate .md file
Yoochard Apr 10, 2018
13090b4
Merge pull request #205 from Yoochard/master
Yoochard Apr 10, 2018
061547c
Disable PersonEditedEvent
emer7 Apr 10, 2018
bad8f20
Merge pull request #206 from emer7/master
emer7 Apr 10, 2018
58f1b93
implement export command
crizyli Apr 10, 2018
4da7b29
Changes implementation of delete notification
IzHoBX Apr 10, 2018
c89bcdb
fix style error
crizyli Apr 10, 2018
f89d82c
fix test error
crizyli Apr 10, 2018
fab3a1d
Merge branch 'master' into master
crizyli Apr 10, 2018
873d336
Does not show notification for deleted person
IzHoBX Apr 10, 2018
d9c3694
add portfolio
crizyli Apr 10, 2018
8c9e27f
Add dismiss command
IzHoBX Apr 10, 2018
ff82a9e
Changes implementation of dismiss command
IzHoBX Apr 11, 2018
276589c
Update index of notification cards at the lower of the list when dism…
IzHoBX Apr 11, 2018
6ecf6f5
Add email command
IzHoBX Apr 11, 2018
8ede552
Add emailall command
IzHoBX Apr 11, 2018
27cc973
UGDG update
Yoochard Apr 11, 2018
f8e27ea
create PPP
Yoochard Apr 11, 2018
0911e0a
update responsibilities
Yoochard Apr 11, 2018
aa7ffd7
UserGuide.adoc: Polish
emer7 Apr 11, 2018
0c85a57
emer7: Add personal portfolio page
emer7 Apr 11, 2018
f208fa7
Collate emer7
emer7 Apr 11, 2018
31f9b03
Fix EOF new line
emer7 Apr 11, 2018
120c688
update menu-bar label font
Yoochard Apr 11, 2018
2942894
Merge pull request #210 from Yoochard/master
Yoochard Apr 11, 2018
b2c9595
partial fix: remove notification cards when deleting person
IzHoBX Apr 11, 2018
589a476
Merge pull request #208 from crizyli/master
crizyli Apr 11, 2018
325f463
Merge branch 'master' into master
emer7 Apr 11, 2018
43d08a0
Merge branch 'master' into ppp
crizyli Apr 11, 2018
3e2ac37
Merge pull request #211 from emer7/master
emer7 Apr 11, 2018
b69ddfd
Re-collate
emer7 Apr 11, 2018
8ab4d2d
Merge branch 'master' into ppp
crizyli Apr 11, 2018
adf02fc
Merge pull request #213 from emer7/master
emer7 Apr 11, 2018
953d54c
Fix collated code
emer7 Apr 11, 2018
7f91b29
Merge pull request #214 from emer7/master
emer7 Apr 11, 2018
86c79ca
Revert "PPP and other documentations"
Yoochard Apr 11, 2018
e46d701
Merge pull request #215 from CS2103JAN2018-W15-B1/revert-210-master
Yoochard Apr 11, 2018
79fdd9b
Revert "Revert "PPP and other documentations""
Yoochard Apr 11, 2018
76537a3
Merge pull request #216 from CS2103JAN2018-W15-B1/revert-215-revert-2…
Yoochard Apr 11, 2018
e540751
fix style issues and tests
IzHoBX Apr 11, 2018
e17b33f
remove irrelevant tests
IzHoBX Apr 11, 2018
6f7d4b2
Merge branch 'master' into master
IzHoBX Apr 11, 2018
3f43980
Merge pull request #212 from crizyli/ppp
crizyli Apr 11, 2018
bed7108
Merge pull request #217 from IzHoBX/master
IzHoBX Apr 11, 2018
afdb68e
Checkstyle: Fix violations
emer7 Apr 11, 2018
bce5c04
Merge pull request #220 from emer7/master
emer7 Apr 11, 2018
4ed3b08
revert commit to fix travis error
Yoochard Apr 11, 2018
021aa07
fix photo issue whit jar version
crizyli Apr 11, 2018
b47e558
Delete DeveloperGuide.pdf
crizyli Apr 11, 2018
7700592
Delete UserGuide.pdf
crizyli Apr 11, 2018
fcb8a09
Update UserGuide.html
crizyli Apr 11, 2018
cbd9949
Update build.gradle
crizyli Apr 11, 2018
c71349c
Update build.gradle
crizyli Apr 11, 2018
86e3d32
Update build.gradle
crizyli Apr 11, 2018
9079f80
fix edit command system test
crizyli Apr 11, 2018
fd00cf9
Merge branch 'master' of https://github.com/crizyli/main
crizyli Apr 11, 2018
47b6226
Merge branch 'master' of https://github.com/CS2103JAN2018-W15-B1/main
Yoochard Apr 11, 2018
2fd9f01
Delete DeveloperGuide.pdf
crizyli Apr 11, 2018
5e805cc
Delete UserGuide.pdf
crizyli Apr 11, 2018
f8bcb5e
Update UserGuide.html
crizyli Apr 11, 2018
12f192c
fix bug with travis long pause
crizyli Apr 11, 2018
7385bc4
Merge branch 'master' into master
crizyli Apr 11, 2018
4f9eec4
Merge pull request #222 from crizyli/master
crizyli Apr 11, 2018
8410393
Merge branch 'master' of https://github.com/CS2103JAN2018-W15-B1/main
Yoochard Apr 11, 2018
9c60edc
Update AboutUs.adoc
crizyli Apr 12, 2018
46e90a6
Delete UI.PNG
crizyli Apr 12, 2018
8a6826e
Delete Ui.png
crizyli Apr 12, 2018
e694eb4
Add files via upload
crizyli Apr 12, 2018
2a1292b
Update README.adoc
crizyli Apr 12, 2018
6694af3
update command box
crizyli Apr 12, 2018
0eff2fa
Delete UI.png
crizyli Apr 12, 2018
2851c5c
Add files via upload
crizyli Apr 12, 2018
e6a2aca
Update README.adoc
crizyli Apr 12, 2018
9e0abd6
update user guide
crizyli Apr 12, 2018
f4cc179
Merge remote-tracking branch 'upstream/master'
crizyli Apr 12, 2018
ecfd942
SampleDataUtil.java: Update sample employees
emer7 Apr 12, 2018
e9019f5
logic.commands: Standardize MESSAGE_USAGE
emer7 Apr 12, 2018
e82064c
CommandBox.java: Add missing commands
emer7 Apr 12, 2018
feaa572
Remove reference to address book and its terminology
emer7 Apr 12, 2018
7f8182f
Merge pull request #223 from emer7/master
emer7 Apr 12, 2018
59f49ce
fix tiny issue with deleting calendar
crizyli Apr 12, 2018
776c7e0
Merge branch 'master' of https://github.com/CS2103JAN2018-W15-B1/main
Yoochard Apr 12, 2018
4625ac6
Merge branch 'master' into master
crizyli Apr 12, 2018
ec5e631
Merge pull request #224 from crizyli/master
crizyli Apr 12, 2018
baddf4f
PersonEditedEvent: Re-implement
emer7 Apr 12, 2018
e565daf
Fix systemtests
emer7 Apr 12, 2018
2d4184f
Merge pull request #225 from emer7/master
emer7 Apr 12, 2018
c894a24
Merge pull request #14 from CS2103JAN2018-W15-B1/master
IzHoBX Apr 12, 2018
1db706f
Fix comments and small details
emer7 Apr 12, 2018
bcc9723
Fix bug where unlock command returns invalid command error if redunda…
IzHoBX Apr 12, 2018
f871939
Remove notification cards associated with a person when deleting that…
IzHoBX Apr 12, 2018
65d0ddd
Makes the error message of dismiss command more consistent
IzHoBX Apr 12, 2018
755e526
Edit collate
emer7 Apr 12, 2018
d5f5754
Collate
emer7 Apr 12, 2018
7b47d8f
Merge pull request #226 from emer7/master
emer7 Apr 12, 2018
bda8f95
Edit style for notification card
IzHoBX Apr 12, 2018
5106833
Bug fixes for test
IzHoBX Apr 12, 2018
c861cbb
Remove outdated test
IzHoBX Apr 12, 2018
1fe9fb3
Merge pull request #221 from Yoochard/master
Yoochard Apr 12, 2018
c1dd19f
fix style issues
IzHoBX Apr 12, 2018
645a3da
Update AboutUs.adoc
Yoochard Apr 12, 2018
43c7b9a
Merge pull request #227 from IzHoBX/master
IzHoBX Apr 12, 2018
71b9810
Collates code for v1.5rc
IzHoBX Apr 12, 2018
f4e765a
Collate EmailAllCommand
IzHoBX Apr 12, 2018
036986d
Merge branch 'master' of https://github.com/CS2103JAN2018-W15-B1/main
Yoochard Apr 13, 2018
aae4a8d
update DG
crizyli Apr 13, 2018
8a33726
adjust BrightTheme
Yoochard Apr 13, 2018
977fc35
Modifies Javadoc comments on input validation
IzHoBX Apr 13, 2018
c8b6cd5
update DG
crizyli Apr 13, 2018
3d2bae3
update ppp
crizyli Apr 13, 2018
a6ce6d0
Merge pull request #228 from crizyli/update_DG
crizyli Apr 13, 2018
e9659e4
Adds tests for Notification
IzHoBX Apr 13, 2018
d30315a
Adds Notification System Test
IzHoBX Apr 13, 2018
1137c23
fix style issues
IzHoBX Apr 13, 2018
151f1ed
Defensive coding
IzHoBX Apr 13, 2018
21c2b49
Reviews code and defensive coding
IzHoBX Apr 14, 2018
f278b3d
Collate tests
IzHoBX Apr 14, 2018
3daf9de
Fixes regression issues
IzHoBX Apr 14, 2018
28a450b
Merge branch 'master' into master
IzHoBX Apr 14, 2018
2fc1a59
Merge pull request #229 from IzHoBX/master
IzHoBX Apr 14, 2018
eea43cb
tidy up code
crizyli Apr 14, 2018
4c713a2
Employees Tracker starts with empty data instead of sample data
emer7 Apr 14, 2018
a15ef0b
test travis with authentication
crizyli Apr 14, 2018
24ffa4c
fix style error
crizyli Apr 14, 2018
274ebd2
fix style error
crizyli Apr 14, 2018
5ed8666
SampleDataTest.java: Fix test
emer7 Apr 14, 2018
d5b3ce0
Checkstyle: Fix violation
emer7 Apr 14, 2018
63bbb48
configure travis.yml
crizyli Apr 14, 2018
34618ef
configure travis.yml
crizyli Apr 14, 2018
632e550
Revert "configure travis.yml"
crizyli Apr 14, 2018
4147352
Revert "configure travis.yml"
crizyli Apr 14, 2018
ee2d737
comment test
crizyli Apr 14, 2018
f09d89e
test travis
crizyli Apr 14, 2018
2a15628
test travis
crizyli Apr 14, 2018
0f2cbb1
style error
crizyli Apr 14, 2018
ee63a59
update tests
crizyli Apr 14, 2018
5580426
fix style error, update collate
crizyli Apr 14, 2018
ad3386e
Update UserGuide.adoc
crizyli Apr 14, 2018
d64867c
update message
crizyli Apr 14, 2018
4e1d6d1
re collate
crizyli Apr 14, 2018
6083647
recollate
crizyli Apr 14, 2018
17324a3
Merge pull request #230 from emer7/master
emer7 Apr 14, 2018
c49ef5a
Merge branch 'master' into master
crizyli Apr 14, 2018
2581239
fix typo
crizyli Apr 14, 2018
5dfeaff
Merge branch 'master' of https://github.com/crizyli/main
crizyli Apr 14, 2018
aacdcd6
Merge pull request #231 from crizyli/master
crizyli Apr 14, 2018
0256d2b
Merge branch 'master' of https://github.com/CS2103JAN2018-W15-B1/main
Yoochard Apr 14, 2018
5b5bced
Update user guide
IzHoBX Apr 15, 2018
7c53c53
Merge branch 'master' of https://github.com/IzHoBX/main
IzHoBX Apr 15, 2018
2f34de4
Merge branch 'master' into master
IzHoBX Apr 15, 2018
d63b988
Update Figures reference numbering
IzHoBX Apr 15, 2018
58cd711
Merge pull request #233 from IzHoBX/master
IzHoBX Apr 15, 2018
45ac7d4
Merge pull request #15 from CS2103JAN2018-W15-B1/master
IzHoBX Apr 15, 2018
98576c3
ReviewCommandSystemTest: Add tests
emer7 Apr 14, 2018
cf2f85b
Remove unused code
emer7 Apr 14, 2018
0bcf7ef
Fix typo
emer7 Apr 14, 2018
1c32880
ReviewCommandSystemTest.java: Add tests
emer7 Apr 14, 2018
11190e4
Fix typo
emer7 Apr 14, 2018
41e1c7c
Checkstyle: Fix violation
emer7 Apr 14, 2018
1b5890f
update AboutUs and ppp
Yoochard Apr 15, 2018
1b2d13e
update UGDG, seq diagram
Yoochard Apr 15, 2018
8ccc359
adjust codes.
Yoochard Apr 15, 2018
70eab80
Fix mistake
emer7 Apr 15, 2018
25bee1a
update collate
Yoochard Apr 15, 2018
02120df
Merge pull request #232 from emer7/master
emer7 Apr 15, 2018
a2caec4
update DG instruction for manual testing
crizyli Apr 15, 2018
514e159
Merge remote-tracking branch 'upstream/master'
crizyli Apr 15, 2018
0cdc04a
Merge pull request #235 from crizyli/master
crizyli Apr 15, 2018
083196c
Merge pull request #234 from Yoochard/master
Yoochard Apr 15, 2018
486f20b
Update UserGuide.adoc
emer7 Apr 15, 2018
e565415
Fix merge conflict
emer7 Apr 15, 2018
f3f8d7a
Merge pull request #236 from emer7/master
emer7 Apr 15, 2018
1a556ff
update Ui.png and UiLabelled.png to be coherent with latest version
Yoochard Apr 15, 2018
699b5b1
tell user explicitly that undo a "delete" command may cause some error
Yoochard Apr 15, 2018
f3ca1dd
Merge branch 'master' into master
Yoochard Apr 15, 2018
3411d00
Merge pull request #237 from Yoochard/master
Yoochard Apr 15, 2018
90795b5
Merge remote-tracking branch 'upstream/master'
crizyli Apr 15, 2018
b103d55
UG fix wrong figure indexing
crizyli Apr 15, 2018
0f51f41
DG update
Yoochard Apr 15, 2018
45454d2
Merge branch 'master' of https://github.com/CS2103JAN2018-W15-B1/main
Yoochard Apr 15, 2018
2d4e2ee
Merge pull request #238 from crizyli/master
crizyli Apr 15, 2018
6140efe
Update Developer Guide
IzHoBX Apr 15, 2018
3b55bfa
Solves code snippet breaking issue
IzHoBX Apr 15, 2018
033305b
Formatting issues
IzHoBX Apr 15, 2018
c26de8f
Merge pull request #239 from Yoochard/master
Yoochard Apr 15, 2018
495cf1e
Merge pull request #240 from IzHoBX/master
IzHoBX Apr 15, 2018
60b552b
Update DeveloperGuide.adoc
crizyli Apr 15, 2018
2b72036
Update UGDG
IzHoBX Apr 15, 2018
67b6de5
Include Portfolio
IzHoBX Apr 15, 2018
fd8eb11
Merge branch 'master' into master
IzHoBX Apr 15, 2018
b15bd27
Update AboutUs
IzHoBX Apr 15, 2018
51a5f9b
Merge pull request #241 from IzHoBX/master
IzHoBX Apr 15, 2018
bf71a3a
Update AboutUs
IzHoBX Apr 15, 2018
063645a
Save changes
IzHoBX Apr 15, 2018
7367e2c
Update AboutUs
IzHoBX Apr 15, 2018
24c7865
Delete JohnDoe.adoc
IzHoBX Apr 15, 2018
23cfd6e
Documentation
emer7 Apr 15, 2018
c097ff3
Collate
emer7 Apr 15, 2018
3becf49
Merge pull request #243 from emer7/master
emer7 Apr 15, 2018
7396244
Merge pull request #242 from IzHoBX/master
IzHoBX Apr 15, 2018
2ff0d51
UserGuide: Update image
emer7 Apr 15, 2018
9b8ef89
Merge pull request #244 from emer7/master
emer7 Apr 15, 2018
f158222
Re-collate
emer7 Apr 15, 2018
356413a
Merge pull request #245 from emer7/master
emer7 Apr 15, 2018
8a5e12d
AboutUs.adoc and PPP
emer7 Apr 15, 2018
ab00fe4
Merge pull request #246 from emer7/master
emer7 Apr 15, 2018
38dc3fb
Fix capitalization
emer7 Apr 15, 2018
f059d8b
Merge pull request #247 from emer7/master
emer7 Apr 15, 2018
11e1c6a
Update README.adoc
emer7 Apr 15, 2018
cde4eb3
Update Class Diagram
emer7 Apr 15, 2018
c278c4f
Merge pull request #248 from emer7/master
emer7 Apr 15, 2018
a3145a5
Final documentation update
IzHoBX Apr 15, 2018
fb13267
Merge branch 'master' into master
IzHoBX Apr 15, 2018
d7e349f
Merge pull request #249 from IzHoBX/master
IzHoBX Apr 15, 2018
b2c3cd9
Adds IzHoBX.html
IzHoBX Apr 17, 2018
2551f98
Deletes IzHoBX.html
IzHoBX Apr 17, 2018
f5761ad
Update Yoochard.adoc
Yoochard Apr 20, 2018
2dc1ff5
Update Yoochard.adoc
Yoochard Apr 20, 2018
75c647b
Update Yoochard.adoc
Yoochard Apr 20, 2018
d155964
update ppp html version
Yoochard Apr 21, 2018
80e5895
new line added at EOF
Yoochard Apr 21, 2018
5dd1896
Merge pull request #250 from Yoochard/master
Yoochard Apr 21, 2018
3888d7c
Add files via upload
crizyli Apr 22, 2018
b361fdd
Delete crizyli.html
crizyli Apr 22, 2018
d5db7a7
Add files via upload
crizyli Apr 22, 2018
365a981
Update crizyli.html
crizyli Apr 22, 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 README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= Address Book (Level 4)
Copy link

Choose a reason for hiding this comment

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

I guess your project is not Address Book anymore :p, please update the Address Book mentions from all instances. You might also need to update or remove stuff that relates only to address-book and not to your project.

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://travis-ci.org/CS2103JAN2018-W15-B1[image:https://travis-ci.org/CS2103JAN2018-W15-B1/main.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]]
Expand Down
Loading