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

Fixes issue #13 #168

Open
wants to merge 91 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
430a7d9
change name to main
shusiner Oct 5, 2016
ae2fdf4
Add dev photo
kwonn Oct 5, 2016
7e26fbb
Update UserGuide.md
shusiner Oct 5, 2016
bb35feb
Add dev photo Annabel Eng
annabeleng Oct 5, 2016
43d335a
Update AboutUs.md
annabeleng Oct 5, 2016
d4addf2
Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main
annabeleng Oct 5, 2016
2374eab
Add files via upload
shusiner Oct 5, 2016
728b682
Update UserGuide.md
kwonn Oct 5, 2016
2f3e652
Update AboutUs.md
annabeleng Oct 5, 2016
f848dd5
Update README.md
kwonn Oct 5, 2016
fec79fe
Add dev photo Ng HuanRan
annabeleng Oct 5, 2016
a134521
Delete extra photos
kwonn Oct 5, 2016
87a4f68
Merge branch 'master' of https://github.com/nus-cs2103-AY1617S1/addre…
kwonn Oct 5, 2016
215aec6
Update DeveloperGuide
annabeleng Oct 5, 2016
348eed2
Merge branch 'master' of https://github.com/nus-cs2103-AY1617S1/addre…
kwonn Oct 5, 2016
b49c08d
Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main
kwonn Oct 5, 2016
b1dc34e
Update DeveloperGuide.md
kwonn Oct 5, 2016
5f9160c
Update DeveloperGuide.md
kwonn Oct 5, 2016
896ef82
Change addressbook to malitio
annabeleng Oct 5, 2016
170f9f3
Modify Molitio so the app can be executed.
annabeleng Oct 5, 2016
3dcb4c4
Add info about myself
KhooDesmond Oct 5, 2016
fbd9243
Change addressbook tests to malitio tests
KhooDesmond Oct 5, 2016
46f1538
Update README.md
KhooDesmond Oct 6, 2016
5990b35
Update README.md
KhooDesmond Oct 6, 2016
4f6208b
Update .project
shusiner Oct 6, 2016
13e579c
Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main…
annabeleng Oct 6, 2016
77dd54c
Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main
annabeleng Oct 6, 2016
30d0c5a
Update UserGuide.md
shusiner Oct 6, 2016
d51415d
Update ReadMe with our mock UI
kwonn Oct 6, 2016
c6a1d55
Refactor address to Malitio where applicable
kwonn Oct 7, 2016
8f6d706
Refactor Person to Task, but doesn't pass all tests yet
kwonn Oct 7, 2016
7439ebe
Edit tests to match refactoring
kwonn Oct 7, 2016
e039507
Merge branch 'Refactor_Person_to_Task' of https://github.com/CS2103AU…
KhooDesmond Oct 9, 2016
9d21652
Change version to v0.1.0, add temporary icon for our app, refactor ma…
KhooDesmond Oct 9, 2016
36de261
Rename app to Malitio
KhooDesmond Oct 10, 2016
c0888db
Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main
annabeleng Oct 10, 2016
d1e838c
Change person test cases to task test cases
KhooDesmond Oct 11, 2016
3be1790
Change app name in config.json file
KhooDesmond Oct 11, 2016
8222330
Change app name in config.json file
KhooDesmond Oct 11, 2016
89b0875
Allow task name to have any character except '/'
kwonn Oct 11, 2016
e7847fe
Merge branch 'Refactor_Person_to_Task'
kwonn Oct 11, 2016
fa35e86
updated another view preparing for event/deadlines.
shusiner Oct 12, 2016
8784fc6
EditCommand can edit floating tasks. (i.e. tasks only with name).
annabeleng Oct 12, 2016
23ee44a
Include deadlines and events as part of task, add DateTime class
KhooDesmond Oct 12, 2016
862c8bd
Refactor task.java
KhooDesmond Oct 13, 2016
c0174dc
Add one test case for add deadline command
KhooDesmond Oct 13, 2016
33e8002
Merge branch 'add_deadlines_and_events' of https://github.com/CS2103A…
annabeleng Oct 13, 2016
ec308ce
Update Parser to support universal add (with errors).
kwonn Oct 12, 2016
bd9c4a6
Support events
KhooDesmond Oct 13, 2016
e6e02af
Merge pull request #5 from CS2103AUG2016-T13-C3/Add_EditCommand
kwonn Oct 13, 2016
83a5e5c
Refactor success add message
KhooDesmond Oct 13, 2016
2a24e55
Merge remote-tracking branch 'origin/add_deadlines_and_events'
kwonn Oct 13, 2016
7920ebe
Merge remote-tracking branch 'origin/event_deadline_UI'
kwonn Oct 13, 2016
581ac86
added deadline, events and floating task classes
shusiner Oct 14, 2016
5d5765a
Changed Task to abstract class and rename all task constructor into F…
shusiner Oct 14, 2016
cd333b5
streamline abstract classes for task events and deadlines
shusiner Oct 14, 2016
751a46a
added tasklist2 to model
shusiner Oct 14, 2016
b2411be
link task list2 to gui
shusiner Oct 14, 2016
0f4aec5
small error on error message for add incorrect command
shusiner Oct 14, 2016
1e3055f
refactored name: task and task2 to floating task and events and deadl…
shusiner Oct 14, 2016
4b810a3
added ability to add deadlines and events
shusiner Oct 14, 2016
07e5921
Change parent class of Deadlines and Events to Schedules
annabeleng Oct 15, 2016
432c4fc
Change XmlAdaptedSchedule to return a Schedule Object with Name and T…
annabeleng Oct 15, 2016
9767935
Refactor FloatingTask, Deadline and Event
annabeleng Oct 17, 2016
63d9f1a
Remove browser panel
annabeleng Oct 17, 2016
94dadac
Add third panel for Events.
annabeleng Oct 17, 2016
59e9f01
Refactor test cases to reflect events, deadlines and floating tasks
KhooDesmond Oct 18, 2016
e03f20a
Fix XmlMalitioStorageTest
KhooDesmond Oct 18, 2016
25da3be
rename logic test cases
shusiner Oct 18, 2016
1ead376
Fix error in test/java/seedu/malitio/testutil
KhooDesmond Oct 18, 2016
b317719
Merge branch 'initialize_storage_for_schedule' of https://github.com/…
KhooDesmond Oct 18, 2016
24f7454
Update AboutUs.md
annabeleng Oct 18, 2016
31d7c63
Change typical test tasks
KhooDesmond Oct 18, 2016
b339e03
Fix testing
KhooDesmond Oct 18, 2016
c71529e
Remove editCommand test and adjusted validMalitio.xml
KhooDesmond Oct 18, 2016
33dd6c2
Merge pull request #20 from CS2103AUG2016-T13-C3/initialize_storage_f…
shusiner Oct 18, 2016
8c7263f
update UiClassDiagram
shusiner Oct 18, 2016
8dbf612
Update DeveloperGuide.md
shusiner Oct 18, 2016
9621585
update UiClassDiagram.png
shusiner Oct 18, 2016
e80eaad
update UiClassDiagram.png
shusiner Oct 18, 2016
47bb3b0
Update Model Picture in ModelClassDiagram
annabeleng Oct 19, 2016
ac8c05b
Update UI image to match final UI
annabeleng Oct 19, 2016
9dd957e
Merge pull request #21 from CS2103AUG2016-T13-C3/UI_documentation
annabeleng Oct 19, 2016
feef41a
Update DeveloperGuide
annabeleng Oct 19, 2016
fb617ec
Merge pull request #22 from CS2103AUG2016-T13-C3/update-developerguide
annabeleng Oct 19, 2016
4246a13
Update FindCommand to find keywords in all event, deadlines and float…
KhooDesmond Oct 19, 2016
802dccb
Revert "Update FindCommand to find keywords in all event, deadlines a…
KhooDesmond Oct 19, 2016
2caf1d8
Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main
KhooDesmond Oct 19, 2016
cb683f2
Update FindCommand to find keywords in all event, deadlines and float…
KhooDesmond Oct 19, 2016
8e127fb
Enhance find command to find only floating task, deadline or schedule
KhooDesmond Oct 19, 2016
804e17e
Fix bug that displays wrong find result
KhooDesmond Oct 19, 2016
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
14 changes: 8 additions & 6 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@
<classpath>
<classpathentry kind="src" path="src/main/java">
<attributes>
<attribute name="FROM_GRADLE_MODEL" value="true"/>
<attribute name="FROM_GRADLE_MODEL" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/main/resources">
<attributes>
<attribute name="FROM_GRADLE_MODEL" value="true"/>
<attribute name="FROM_GRADLE_MODEL" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/test/java">
<attributes>
<attribute name="FROM_GRADLE_MODEL" value="true"/>
<attribute name="FROM_GRADLE_MODEL" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" />
<classpathentry kind="con"
path="org.eclipse.buildship.core.gradleclasspathcontainer" />
<classpathentry kind="output" path="bin" />
</classpath>
2 changes: 1 addition & 1 deletion .project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>addressbook-level4</name>
<name>Malitio</name>
<comment>Project addressbook-level4 created by Buildship.</comment>
<projects>
</projects>
Expand Down
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 task 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 tasks 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
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[![Build Status](https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master)](https://travis-ci.org/se-edu/addressbook-level4)
[![Coverage Status](https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master)](https://coveralls.io/github/se-edu/addressbook-level4?branch=master)

# Address Book (Level 4)
# Malitio

<img src="docs/images/Ui.png" width="600"><br>
<img src="docs/images/Ui.jpg" width="600"><br>

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using
* This is a desktop to-do list 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.
Expand All @@ -28,7 +28,9 @@
#### Acknowledgements

* Some parts of this sample application were inspired by the excellent
[Java FX tutorial](http://code.makery.ch/library/javafx-8-tutorial/) by *Marco Jakob*.
[Java FX tutorial](http://code.makery.ch/library/javafx-8-tutorial/) by *Marco Jakob*.

* Base code by SE-EDU initiative at https://github.com/se-edu/


#### Licence : [MIT](LICENSE)
#### License : [MIT](LICENSE)
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ allprojects {
}

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

manifest {
attributes "Main-Class": "seedu.address.MainApp"
Expand Down Expand Up @@ -113,8 +113,8 @@ tasks.coveralls {
onlyIf { System.env.'CI' }
}

class AddressBookTest extends Test {
public AddressBookTest() {
class malitioTest extends Test {
public malitioTest() {
forkEvery = 1
systemProperty 'testfx.setup.timeout', '60000'
}
Expand All @@ -128,7 +128,7 @@ class AddressBookTest extends Test {
}
}

task guiTests(type: AddressBookTest) {
task guiTests(type: malitioTest) {
include 'guitests/**'

jacoco {
Expand All @@ -137,7 +137,7 @@ task guiTests(type: AddressBookTest) {
}


task nonGuiTests(type: AddressBookTest) {
task nonGuiTests(type: malitioTest) {
include 'seedu/address/**'

jacoco {
Expand All @@ -146,7 +146,7 @@ task nonGuiTests(type: AddressBookTest) {
}

// Test mode depends on whether headless task has been run
task allTests(type: AddressBookTest) {
task allTests(type: malitioTest) {
jacoco {
destinationFile = new File("${buildDir}/jacoco/test.exec")
}
Expand Down
7 changes: 7 additions & 0 deletions config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"appTitle" : "Malitio",
"logLevel" : "INFO",
"userPrefsFilePath" : "preferences.json",
"malitioFilePath" : "data/malitio.xml",
"malitioName" : "Malitio"
}
Loading