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

[T10-1] Task Scheduler #106

Open
wants to merge 573 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 116 commits
Commits
Show all changes
573 commits
Select commit Hold shift + click to select a range
a203c15
Merge pull request #81 from vig42/master
SleepySanjinLi Nov 5, 2018
b9aa74d
UI for description
SleepySanjinLi Nov 5, 2018
323797a
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
SleepySanjinLi Nov 5, 2018
fe2f774
command for show description and tests
SleepySanjinLi Nov 5, 2018
383569c
UI modify
SleepySanjinLi Nov 5, 2018
c854d6e
delete arrow
SleepySanjinLi Nov 5, 2018
fd4effa
checkStyle
SleepySanjinLi Nov 5, 2018
b4d09ac
checkStyle
SleepySanjinLi Nov 5, 2018
d6a156c
checkStyle
SleepySanjinLi Nov 5, 2018
014aac7
checkStyle
SleepySanjinLi Nov 5, 2018
015fd3e
checStyle
SleepySanjinLi Nov 5, 2018
4a426fe
checkStyle
SleepySanjinLi Nov 5, 2018
0da8775
checkStyle
SleepySanjinLi Nov 5, 2018
989c254
checkStyle
SleepySanjinLi Nov 5, 2018
05bd4a4
Modify CalendarEventCard to include start and end date, and recolour …
vig42 Nov 6, 2018
12949c6
Update GUI colours
vig42 Nov 6, 2018
a6c7e4a
Update Unknown Command message to add reference to help command
vig42 Nov 6, 2018
8c7744d
Add newline at EOF
vig42 Nov 6, 2018
7793444
Tweak tab background colour
vig42 Nov 6, 2018
93255a0
Update UI screenshot
vig42 Nov 6, 2018
0b0402d
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
bryanwongweiheng Nov 7, 2018
978c7c8
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
bryanwongweiheng Nov 7, 2018
7385f40
Tests: Fix regressions caused by changing XML files
bryanwongweiheng Nov 7, 2018
f6ff6a1
Tests: Fix SelectCommandSystemTest
bryanwongweiheng Nov 7, 2018
58e7afd
checkstyle
bryanwongweiheng Nov 7, 2018
2617d9e
Merge pull request #111 from vig42/master
pangjiahao Nov 7, 2018
a6bfd92
Tests: Removed comments for HelpCommandSystemTest
bryanwongweiheng Nov 7, 2018
032e1d5
Minor code improvements
pangjiahao Nov 7, 2018
be5d9d8
improve calendar dialog layout
pangjiahao Nov 7, 2018
06cf736
add tests for the calendar display
pangjiahao Nov 7, 2018
aebe809
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
pangjiahao Nov 7, 2018
d1590e8
refactor: change person / addressbook to calendar event / scheduler
bryanwongweiheng Nov 7, 2018
d22784e
Tests: uncomment @Test annotation for ClearCalendarCommandSystemTest
bryanwongweiheng Nov 7, 2018
df8d67f
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
bryanwongweiheng Nov 7, 2018
f9cc0b1
UI: change fxml version to 8
bryanwongweiheng Nov 7, 2018
0781394
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
SleepySanjinLi Nov 7, 2018
5e7f92c
change command word
SleepySanjinLi Nov 7, 2018
0003174
add SchedulerParserTest for showDescription
SleepySanjinLi Nov 7, 2018
91b437c
remove javadoc
SleepySanjinLi Nov 7, 2018
664dc0e
UI: set shortcuts for switching tabs and left / right arrows,
bryanwongweiheng Nov 7, 2018
16dc654
Commons: add SwitchTabEvent
bryanwongweiheng Nov 7, 2018
e0895fd
Merge pull request #112 from bryanwongweiheng/master
vig42 Nov 7, 2018
2470425
Update Fuzzy Search and add Filtering by Date
vig42 Nov 7, 2018
0e6095c
update calendarDisplay to store events in same order as the list view
pangjiahao Nov 7, 2018
ec6a836
Resolve merge conflicts
vig42 Nov 7, 2018
918bfce
Merge branch 'master' into master
SleepySanjinLi Nov 7, 2018
9be825f
Add list todo command to match the User Guide
vig42 Nov 7, 2018
8120f77
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
pangjiahao Nov 7, 2018
f8b16c4
Merge pull request #78 from SleepySanjinLi/master
SleepySanjinLi Nov 7, 2018
10b17ef
Fix bug with edit event
vig42 Nov 7, 2018
52c76fe
Fix checkstyle
vig42 Nov 7, 2018
b1ef398
Fix tests
vig42 Nov 8, 2018
37fb644
Fix AddCommandSystemTest
vig42 Nov 8, 2018
0b03d60
Fix DeleteEventCommandSystemTest and EditEventCommandSystemTest
vig42 Nov 8, 2018
1f426ce
set show description uneditable
SleepySanjinLi Nov 8, 2018
32ae109
Remove todo comment from TaskListPanelTest
vig42 Nov 8, 2018
7f5ff82
fixing tests
pangjiahao Nov 8, 2018
307e197
Merge branch 'findFix' of https://github.com/CS2103-AY1819S1-T10-1/ma…
pangjiahao Nov 8, 2018
44bbb13
fix EditEventCommandSystemTest
pangjiahao Nov 8, 2018
5750aad
fix incorrect method
pangjiahao Nov 8, 2018
1abb5b5
make data inside CalendarPanelSelectionChangedEvent public for consis…
pangjiahao Nov 9, 2018
6fcad46
refactor SwitchTabEvent to SwitchToToDoTabEvent for consistency
pangjiahao Nov 9, 2018
8f7d7f7
Minor refactoring for Util classes
pangjiahao Nov 9, 2018
c37de83
refactor MESSAGE_DATETIMEINPUT_CONSTRAINTS to MESSAGE_DATETIME_INPUT_…
pangjiahao Nov 9, 2018
ba1239f
refactor model classes
pangjiahao Nov 9, 2018
7ba8248
change sample calendar events
pangjiahao Nov 9, 2018
9c2b232
Merge pull request #113 from vig42/master
pangjiahao Nov 9, 2018
2d9de2d
fix checkstyle
pangjiahao Nov 9, 2018
865c4d1
add FSList.java: a class to combine functionalities of SortedList and…
pangjiahao Nov 9, 2018
88b908b
fix ClearCalendarCommand: it was missing a call to model.resetFiltere…
pangjiahao Nov 9, 2018
e584a50
add FSList.java.
pangjiahao Nov 10, 2018
445fff5
Integrate FSList into the project.
pangjiahao Nov 10, 2018
4a8ba4e
Update MainWindow.java to no longer need a RefreshCalendarPanelEvent …
pangjiahao Nov 10, 2018
26ad4a6
Fix bug in the clear calendar command.
pangjiahao Nov 10, 2018
4d18e5d
Update and fix TestApp.
pangjiahao Nov 10, 2018
b2772df
Update AddEventCommandTest: add the required stub methods.
pangjiahao Nov 10, 2018
238a025
Fix EditEventCommandSystemTest.
pangjiahao Nov 10, 2018
fb3ad8b
Rename FSList.java to FsList.java.
pangjiahao Nov 10, 2018
30577df
Rename SwitchToToDoTabEvent to SwitchTabEvent.
pangjiahao Nov 10, 2018
5e64985
Fix checkstyle issue.
pangjiahao Nov 10, 2018
75c9c82
Merge pull request #115 from SleepySanjinLi/master
pangjiahao Nov 10, 2018
f6bbc3b
Merge pull request #116 from pangjiahao/master
pangjiahao Nov 10, 2018
7bff8b0
Update developer guide.
pangjiahao Nov 10, 2018
e903d9a
Merge pull request #117 from pangjiahao/master
pangjiahao Nov 10, 2018
612621f
Update developer guide storage section.
pangjiahao Nov 10, 2018
d20c6d9
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
pangjiahao Nov 10, 2018
d0ee2b7
Update Developer Guide: Architecture, Logic and Model
vig42 Nov 10, 2018
e893c15
Modify Developer Guide: model
vig42 Nov 10, 2018
bdc1ec3
Refactor CalendarDisplay (Minor)
pangjiahao Nov 10, 2018
61fb9af
Merge pull request #119 from vig42/master
vig42 Nov 10, 2018
f232fc3
AddToDoCommandSystemTest
SleepySanjinLi Nov 10, 2018
0e1adcf
Update Developer Guide Diagrams
vig42 Nov 10, 2018
2eec8e5
Resolve merge conflict
vig42 Nov 10, 2018
67be763
Merge pull request #122 from vig42/master
vig42 Nov 10, 2018
cc2540f
Reorder Developer Guide Sections
vig42 Nov 10, 2018
63834b9
Resolve merge conflicts
vig42 Nov 10, 2018
1d30ff0
Update CalendarDisplayTest
pangjiahao Nov 10, 2018
efbfba3
Add DescriptionDisplayHandle
pangjiahao Nov 11, 2018
1be8793
Add DescriptionDisplayTest
pangjiahao Nov 11, 2018
26c915b
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
pangjiahao Nov 11, 2018
e8a5537
checkStyle and rename
SleepySanjinLi Nov 11, 2018
9b81267
Update User Guide (#124)
bryanwongweiheng Nov 11, 2018
47dd032
checkStyle
SleepySanjinLi Nov 11, 2018
39368e9
developer guide
SleepySanjinLi Nov 11, 2018
27cd3fe
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
pangjiahao Nov 11, 2018
5ad6387
developer guide
SleepySanjinLi Nov 11, 2018
9517d20
typo
SleepySanjinLi Nov 11, 2018
2d8e3f8
architecture diagram
SleepySanjinLi Nov 11, 2018
635093f
LogicClassDiagram
SleepySanjinLi Nov 11, 2018
1ca3328
LogicComponentSequenceDiagram
SleepySanjinLi Nov 11, 2018
2b0072e
StorageClassDiagram
SleepySanjinLi Nov 11, 2018
34883e2
UIClassDiagram
SleepySanjinLi Nov 11, 2018
1622a3a
UIdiagram
SleepySanjinLi Nov 11, 2018
8216cf9
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
SleepySanjinLi Nov 11, 2018
e279355
modify
SleepySanjinLi Nov 11, 2018
50733e8
modify
SleepySanjinLi Nov 11, 2018
7e712d3
refactor
SleepySanjinLi Nov 11, 2018
a842899
change UI image
SleepySanjinLi Nov 11, 2018
a50af8a
add show description and delete todo in UserGuide
SleepySanjinLi Nov 11, 2018
36887c6
modify
SleepySanjinLi Nov 11, 2018
d8b4fd7
modify
SleepySanjinLi Nov 11, 2018
6758e47
add list todo things in DG
SleepySanjinLi Nov 11, 2018
4177250
typo
SleepySanjinLi Nov 11, 2018
11bab9a
typo
SleepySanjinLi Nov 11, 2018
f395c36
checkStyle
SleepySanjinLi Nov 11, 2018
c1114e6
Refactor various Predicate & Comparator classes and write tests
vig42 Nov 11, 2018
bb3879b
Resolve merge conflicts
vig42 Nov 11, 2018
b558669
Update User guide: update the calendar section, add to the FAQ section
pangjiahao Nov 11, 2018
d2fa6d6
Update Developer guide
pangjiahao Nov 11, 2018
3c81bb4
Merge pull request #120 from SleepySanjinLi/master
SleepySanjinLi Nov 11, 2018
a305199
remove toggling between weekly and daily view.
pangjiahao Nov 11, 2018
195e0f0
Merge PRs
vig42 Nov 11, 2018
20bd1e5
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
pangjiahao Nov 11, 2018
4381fe7
add newline at EOF
pangjiahao Nov 11, 2018
1b1ed4d
Merge pull request #123 from pangjiahao/master
SleepySanjinLi Nov 11, 2018
94d5a95
Docs (#128)
bryanwongweiheng Nov 11, 2018
5756758
Refactor ModelManager
vig42 Nov 11, 2018
ea8cb3a
Merge PRs
vig42 Nov 11, 2018
99743c2
remove test
SleepySanjinLi Nov 11, 2018
53d1b50
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
SleepySanjinLi Nov 11, 2018
040af9a
checkStyle
SleepySanjinLi Nov 11, 2018
5ff9f24
add tags in DG
SleepySanjinLi Nov 11, 2018
6213ef5
ppp
SleepySanjinLi Nov 11, 2018
165b64e
add tag for showDes
SleepySanjinLi Nov 11, 2018
77ad4ae
Add TypcialToDoEvents
pangjiahao Nov 11, 2018
995e199
Fix bug in TaskListPanelHandle.
pangjiahao Nov 11, 2018
b5e1276
Fix bug in ToDoListEventCard.
pangjiahao Nov 11, 2018
7cfd723
Add ToDoList related methods to the testing classes.
pangjiahao Nov 11, 2018
91e2d4f
Fix AddToDoCommandSystemTest.
pangjiahao Nov 11, 2018
29d1648
Fix checkstyle
pangjiahao Nov 11, 2018
581188f
checkStyle
SleepySanjinLi Nov 11, 2018
bb4316b
Fix bug in Argument Tokenizer
vig42 Nov 11, 2018
8e4429a
Merge pull request #130 from pangjiahao/master
pangjiahao Nov 11, 2018
b217770
Fix Checkstyle errors
vig42 Nov 11, 2018
a4547f4
Fix Checkstyle errors
vig42 Nov 11, 2018
9e6d1a8
Resolve merge conflicts
vig42 Nov 11, 2018
b7ce8e1
Fix Checkstyle errors
vig42 Nov 11, 2018
0994363
Refactor SystemTestSetupHelper and TestApp.
pangjiahao Nov 11, 2018
284369e
Minor refactoring for ToDoSystemTests.
pangjiahao Nov 11, 2018
3d322fd
Remove RefreshCalendarPanelEvent and modify MainWindow accordingly
vig42 Nov 11, 2018
780edf9
Add project portfolio
vig42 Nov 11, 2018
e341c08
Add ArgumentTokenizer tests
vig42 Nov 11, 2018
2a94b05
Removed bug with select event affecting to do list.
pangjiahao Nov 12, 2018
3c44f71
remove global calendar navigation.
pangjiahao Nov 12, 2018
bc33bd7
Fix checkstyle.
pangjiahao Nov 12, 2018
97b6bbb
Fix FindCommandSystemTests and refactor some test-related classes
vig42 Nov 12, 2018
02c0fb1
Add test cases to Edit and FindCommandSystemTest
vig42 Nov 12, 2018
cad5323
Merge pull request #132 from pangjiahao/master
vig42 Nov 12, 2018
23eea0c
Merge pull request #129 from SleepySanjinLi/master
vig42 Nov 12, 2018
a03a773
Resolve merge conflicts
vig42 Nov 12, 2018
3e33dd0
Add newline at end of personal portfolio
vig42 Nov 12, 2018
39dacbb
update ui
SleepySanjinLi Nov 12, 2018
4680916
Merge pull request #133 from SleepySanjinLi/master
SleepySanjinLi Nov 12, 2018
b1cca94
Refactor classes to consistently match UserGuide
vig42 Nov 12, 2018
d127fdb
Add link to RepoSense in PPP
vig42 Nov 12, 2018
e03491a
Merge PRs
vig42 Nov 12, 2018
13b25d1
Refactor FindCommandParser
vig42 Nov 12, 2018
143336c
refactor typicaltodolistEvents and related file
SleepySanjinLi Nov 12, 2018
1871309
update aboutus-sleepy
SleepySanjinLi Nov 12, 2018
22a3005
checkStyle
SleepySanjinLi Nov 12, 2018
5884a84
Refactor FindCommandParser
vig42 Nov 12, 2018
5772469
ppp
SleepySanjinLi Nov 12, 2018
a0e5afa
no message
SleepySanjinLi Nov 12, 2018
1b1cfe0
Change address book to scheduler in comment
vig42 Nov 12, 2018
1dd9d64
checkStyle
SleepySanjinLi Nov 12, 2018
c05cf62
typo
SleepySanjinLi Nov 12, 2018
7808da2
typo
SleepySanjinLi Nov 12, 2018
8982a3a
modify useless sentences
SleepySanjinLi Nov 12, 2018
320ee32
modify docs
SleepySanjinLi Nov 12, 2018
a3f2877
no message
SleepySanjinLi Nov 12, 2018
7388f82
Merge pull request #131 from vig42/master
vig42 Nov 12, 2018
18de54b
Merge branch 'master' into master
SleepySanjinLi Nov 12, 2018
8836b6a
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
SleepySanjinLi Nov 12, 2018
e3e0cb5
Merge branch 'master' of https://github.com/SleepySanjinLi/main
SleepySanjinLi Nov 12, 2018
0a931d6
no message
SleepySanjinLi Nov 12, 2018
f537c93
Merge pull request #134 from SleepySanjinLi/master
SleepySanjinLi Nov 12, 2018
5164f6d
Add assertions to Predicates and Comparators
vig42 Nov 12, 2018
e065d7e
Merge PRs
vig42 Nov 12, 2018
41e8bbc
typo
SleepySanjinLi Nov 12, 2018
f55f3a3
Update docs.
pangjiahao Nov 12, 2018
174ce54
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
pangjiahao Nov 12, 2018
7c5406d
Update User Guide and PPP
vig42 Nov 12, 2018
aa81891
Merge PRs
vig42 Nov 12, 2018
3a5d3b4
Update PPP
vig42 Nov 12, 2018
024b90b
Update User Guide and PPP
vig42 Nov 12, 2018
a8abfa4
Remove trailing whitespace at end of line
vig42 Nov 12, 2018
78e4c8b
Update PPP
vig42 Nov 12, 2018
b2a2e9b
Add comments
vig42 Nov 12, 2018
549e33e
Update PPP.
pangjiahao Nov 12, 2018
6d3d94d
Docs (#135)
bryanwongweiheng Nov 12, 2018
0acc414
Modify DeveloperGuide
vig42 Nov 12, 2018
8e8decc
Merge PRs
vig42 Nov 12, 2018
82f693d
Update PPP
vig42 Nov 12, 2018
6310571
Merge pull request #137 from pangjiahao/master
pangjiahao Nov 12, 2018
e80a21a
Update README.adoc: Add Agenda under thrid party libs used.
pangjiahao Nov 12, 2018
f750e5d
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
pangjiahao Nov 12, 2018
e6ddfd8
refactor parser name
bryanwongweiheng Nov 12, 2018
1014195
checkstyle
bryanwongweiheng Nov 12, 2018
1a67189
Update DeveloperGuide and UserGuide
pangjiahao Nov 12, 2018
f9e77a9
Update Developer Guide
vig42 Nov 12, 2018
5f80bc5
Merge PRs
vig42 Nov 12, 2018
0804597
Merge pull request #138 from bryanwongweiheng/master
SleepySanjinLi Nov 12, 2018
86d9f46
Merge pull request #139 from pangjiahao/master
pangjiahao Nov 12, 2018
9ac7481
Update Developer Guide
vig42 Nov 12, 2018
9056b48
Update Docs (#140)
bryanwongweiheng Nov 12, 2018
e3dcc5e
Merge PRs
vig42 Nov 12, 2018
26bdc66
Resolve merge conflicts
vig42 Nov 12, 2018
2a81ca2
change personUtil -> calendareventUtil
SleepySanjinLi Nov 12, 2018
1bf7f03
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
SleepySanjinLi Nov 12, 2018
5ac00f5
Update Developer Guide
vig42 Nov 12, 2018
b51c675
Merge pull request #136 from vig42/master
vig42 Nov 12, 2018
54f08c9
checkStyle
SleepySanjinLi Nov 12, 2018
3b3f702
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
SleepySanjinLi Nov 12, 2018
bb1ff3a
Update Developer Guide
vig42 Nov 12, 2018
5c2c782
Update PPP and Developer Guide
vig42 Nov 12, 2018
5076086
checkStyle
SleepySanjinLi Nov 12, 2018
274ac25
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T10-1/main
SleepySanjinLi Nov 12, 2018
137fe3e
Update Dev Guide.
pangjiahao Nov 12, 2018
726e3af
Merge pull request #142 from pangjiahao/master
pangjiahao Nov 12, 2018
c558983
Update Developer Guide
vig42 Nov 12, 2018
188d78b
Update Developer Guide
vig42 Nov 12, 2018
7cce09f
Merge pull request #141 from SleepySanjinLi/master
SleepySanjinLi Nov 12, 2018
6aa5b10
Update Developer Guide
vig42 Nov 12, 2018
9841d5f
manual testing
SleepySanjinLi Nov 12, 2018
2ffae08
Merge pull request #144 from SleepySanjinLi/master
SleepySanjinLi Nov 12, 2018
9a09d41
Fix errors in User Guide
vig42 Nov 12, 2018
ed639a5
Merge PRs
vig42 Nov 12, 2018
77019cd
Update Developer Guide
vig42 Nov 12, 2018
6915e68
Remove dead code from fxml
vig42 Nov 12, 2018
37aee24
DevGuide: add test case (#145)
bryanwongweiheng Nov 12, 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
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 calendarEvent 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 calendarEvents 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
25 changes: 11 additions & 14 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
= Address Book (Level 4)
= U-Schedule

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/CS2103-AY1819S1-T10-1/main[image:https://travis-ci.org/CS2103-AY1819S1-T10-1/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/CS2103-T10-1/main/branch/master[image:https://ci.appveyor.com/api/projects/status/tckfg9mk2c7e4nbl/branch/master?svg=true[Build status]]
https://coveralls.io/github/CS2103-AY1819S1-T10-1/main?branch=master[image:https://coveralls.io/repos/github/CS2103-AY1819S1-T10-1/main/badge.svg?branch=master[Coverage Status]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]

== About
*U-Schedule* is an open source desktop calendar application for tech-savvy university students who are comfortable with a command line interface (CLI). Managing your hectic university life has never been as simple, with U-Schedule's efficient CLI combined with a fast, beautiful and responsive graphical user interface (GUI). To get started, check out the <<UserGuide#, user guide>>

== Screenshot

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
endif::[]
Expand All @@ -15,19 +20,10 @@ 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.

== Site Map

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

Expand All @@ -36,5 +32,6 @@ endif::[]
* 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/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/junit5[JUnit5]
* Original source code from https://github.com/se-edu/addressbook-level4[AddressBook-Level4] project created by SE-EDU initiative at https://github.com/se-edu/

== Licence : link:LICENSE[MIT]
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ dependencies {
String testFxVersion = '4.0.12-alpha'
String jUnitVersion = '5.1.0'

compile 'com.joestelmach:natty:0.13'
compile 'me.xdrop:fuzzywuzzy:1.1.10'

implementation group: 'org.controlsfx', name: 'controlsfx', version: '8.40.11'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
Expand Down
2 changes: 1 addition & 1 deletion config/travis/deploy_github_pages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set -o nounset # exit if variable is unset
cd build/docs/html5

git init
git config user.name 'Deployment Bot (Travis)'
git config user.title 'Deployment Bot (Travis)'
git config user.email '[email protected]'

git config credential.helper 'store --file=.git/credentials'
Expand Down
46 changes: 21 additions & 25 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,46 +11,42 @@ We are a team based in the http://www.comp.nus.edu.sg[School of Computing, Natio

== Project Team

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
=== Vighnesh Ramesh Iyer
image::vig42.png[width="150", align="left"]
{empty}[https://github.com/vig42] [<<johndoe#, portfolio>>]

Role: Project Advisor
Role: Team Lead, Developer +
Responsibilities: Dev Ops, Integration, Travis expert +
In Charge Of: Main, Commons

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]

Role: Team Lead +
Responsibilities: UI

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Pang Jia Hao
image::pangjiahao.png[width="150", align="left"]
{empty}[https://github.com/pangjiahao] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Data
Responsibilities: Testing, Scheduling and tracking, JavaFX expert +
In Charge Of: UI

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Li Yixin
image::sleepysanjinli.png[width="150", align="left"]
{empty}[https://github.com/SleepySanjinLi] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Code Quality, Deliverables and deadlines, Gradle expert +
In Charge Of: Logic

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Bryan Wong Wei Heng
image::bryanwongweiheng.png[width="150", align="left"]
{empty}[http://github.com/bryanwongweiheng] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: UI
Responsibilities: Documentation, git expert +
In Charge Of: Model, Storage

'''
Loading