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

Login_v2 Working #3

Open
wants to merge 74 commits into
base: master
Choose a base branch
from
Open

Login_v2 Working #3

wants to merge 74 commits into from

Conversation

Pearlissa
Copy link
Owner

Add Login feature:

new: Login Ui
how it works:
1.Login page appears
2.New user enters desired username and password: new user is created and can proceed to use the app
3.Existing user types in credentials, will load user data if authentication is successful
4.If user exists and incorrect password is entered, no access will be granted

WoodySIN and others added 30 commits March 27, 2018 19:31
…into TodoList

# Conflicts:
#	docs/DeveloperGuide.adoc
#	src/main/java/seedu/address/MainApp.java
#	src/main/java/seedu/address/logic/parser/ParserUtil.java
1. Changed deadline such that outdated task will be deleted instead of crashing program
2. Changed calendar such that buttons work as it should now
3. Tasks previews in calendar now shows 20 characters before “…” (up from 7).

Feature changes:

1. Priority now only takes in values ranging from 1 to 3, 1 being lowest, 3 being highest.
2. Overhauled the design of the calendar’s link to the model
    1. previous implementation:
        1. Calendar is linked to filtered task list (same as todo list)
    2. new implementation:
        1. Calendar is now independent of the filtered task list, and now dependent on a calendarList which is a 2D array of ObservableLists.
        2. New restriction to tasks: can only be scheduled at most 6 months in advance.
3. Colour scheme of the calendar changed. (css file overhaul will be done if time permits)
4. Tasks now appear with colour codes:
    1. priority 3: red
    2. priority 2: yellow
    3. priority 1: green

Currently in work:

1. Edit task & Remove task command
2. Test cases for task and calendar
3. Change all person commands to include word person in the command word to differentiate from tasks.
Bug fixes & feature changes for Tasks and Calendar
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main into v1.4Participation

# Conflicts:
#	src/main/java/seedu/address/model/Model.java
#	src/main/java/seedu/address/model/ModelManager.java
WoodySIN and others added 29 commits April 6, 2018 11:57
error in Priority message fixed.
# Conflicts:
#	collated/functional/Alaru-reused.md
#	collated/functional/Alaru.md
#	collated/test/Alaru.md
#	docs/UserGuide.adoc
#	src/main/java/seedu/address/commons/events/model/TaskBookChangedEvent.java
#	src/main/java/seedu/address/commons/events/ui/TodoPanelSelectionChangedEvent.java
#	src/main/java/seedu/address/commons/util/DeleteUtil.java
#	src/main/java/seedu/address/logic/commands/DeleteTaskCommand.java
#	src/main/java/seedu/address/logic/commands/EditTaskCommand.java
#	src/main/java/seedu/address/logic/commands/MarkCommand.java
#	src/main/java/seedu/address/logic/parser/DeleteTaskCommandParser.java
#	src/main/java/seedu/address/logic/parser/EditTaskCommandParser.java
#	src/main/java/seedu/address/logic/parser/MarkCommandParser.java
#	src/main/java/seedu/address/logic/parser/ParserUtil.java
#	src/main/java/seedu/address/model/AddressBook.java
#	src/main/java/seedu/address/model/ModelManager.java
#	src/main/java/seedu/address/model/item/UniqueItemList.java
#	src/main/java/seedu/address/model/person/Participation.java
#	src/main/java/seedu/address/model/task/Priority.java
#	src/main/java/seedu/address/model/task/Title.java
#	src/main/java/seedu/address/model/task/UniqueTaskList.java
#	src/main/java/seedu/address/storage/XmlAdaptedItem.java
#	src/main/java/seedu/address/ui/TodoCard.java
#	src/main/java/seedu/address/ui/TodoListPanel.java
#	src/main/resources/view/NewTheme.css
#	src/test/java/seedu/address/logic/commands/AddCommandTest.java
#	src/test/java/seedu/address/model/UniqueTaskListTest.java
#	src/test/java/seedu/address/model/task/DeadlineTest.java
#	src/test/java/seedu/address/model/task/PriorityTest.java
#	src/test/java/seedu/address/model/task/TaskDescriptionTest.java
Fix MarkCommand adding more than 100
add AddTaskCommandTest and relevant TaskBuilder
Pearlissa pushed a commit that referenced this pull request Apr 15, 2018
#2 add list current month task command
#3 add sort tasks by dates

CS2103JAN2018-F09-B1#4 add tests to the new features

CS2103JAN2018-F09-B1#5 fix some bugs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants