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

Jump to bottom

Fix styling issues due to merge conflicts #80

Merged
merged 36 commits into from Oct 24, 2019
Merged

Fix styling issues due to merge conflicts #80

Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
a2d0976
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F09-1/main
gohruizhi Oct 1, 2019
0c3730a
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F09-1/main
gohruizhi Oct 2, 2019
8b09156
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F09-1/main
gohruizhi Oct 9, 2019
70b8374
Import from excel function
gohruizhi Oct 10, 2019
9e5d2f3
Adds implementation for ExcelReader
gohruizhi Oct 10, 2019
3dfae0d
debug importExcel classes
gohruizhi Oct 10, 2019
6001c75
Merge branch 'master' into Import
mirozo Oct 10, 2019
1a60860
Check style for Import branch
gohruizhi Oct 10, 2019
019e244
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F09-1/mai…
gohruizhi Oct 13, 2019
ded7de8
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F09-1/main
gohruizhi Oct 13, 2019
ef22315
Reads csv file correctly
gohruizhi Oct 13, 2019
ae8bfae
Finished up import interviewers feature
gohruizhi Oct 17, 2019
3c6b8db
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F09-1/mai…
gohruizhi Oct 17, 2019
4e482fb
Integrated with Schedule class and removed ScheduleStub
gohruizhi Oct 17, 2019
e593e73
Handles import exceptions
gohruizhi Oct 17, 2019
1409bfe
Corrected Styling
gohruizhi Oct 17, 2019
c805942
Adds test for Import commands
gohruizhi Oct 17, 2019
6c3e550
Corrects styling for Import Tests
gohruizhi Oct 17, 2019
8578ec4
Rename ExcelReader to CsvReader
gohruizhi Oct 17, 2019
9fcfe0c
handles exceptions for import interviewers
gohruizhi Oct 18, 2019
0650d05
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F09-1/mai…
gohruizhi Oct 18, 2019
03e1dc9
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F09-1/mai…
gohruizhi Oct 21, 2019
b49e15f
Adds intervieweesList attribute to model
gohruizhi Oct 21, 2019
061ff24
Travis fix
gohruizhi Oct 21, 2019
6a91795
Travis fix
gohruizhi Oct 21, 2019
957febe
Style fix
gohruizhi Oct 22, 2019
8fafc08
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F09-1/mai…
gohruizhi Oct 23, 2019
004e607
UML Diagrams
gohruizhi Oct 23, 2019
0284240
Update Developer's Guide
gohruizhi Oct 24, 2019
3e3a6ba
Resized diagrams
gohruizhi Oct 24, 2019
63af7b9
Resize diagrams
gohruizhi Oct 24, 2019
18fd0c0
Merge branch 'DG'
gohruizhi Oct 24, 2019
338fb63
Style fix
gohruizhi Oct 24, 2019
2333d5f
Merge branch 'DG'
gohruizhi Oct 24, 2019
93f62b8
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F09-1/mai…
gohruizhi Oct 24, 2019
e1066c1
Fixed styling issues in devdocs
gohruizhi Oct 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions docs/DeveloperGuide.adoc
View file
Open in desktop
Expand Up @@ -256,7 +256,6 @@ image::ExportActivityDiagram.png[]

// tag::dataencryption[]
=== [Proposed] Data Encryption
=======

=== Logging

Expand All @@ -272,7 +271,7 @@ We are using `java.util.logging` package for logging. The `LogsCenter` class is
* `INFO` : Information showing the noteworthy actions by the App
* `FINE` : Details that is not usually noteworthy but may be useful in debugging e.g. print the actual list instead of just its size

[[Implementation-Configuration]]
[Implementation-Configuration]
=== Configuration

Certain properties of the application can be controlled (e.g user prefs file location, logging level) through the configuration file (default: `config.json`).
Expand Down