forked from CS2103JAN2018-F09-B1/main
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Pearlissa
wants to merge
74
commits into
master
Choose a base branch
from
Login_v2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…into TodoList # Conflicts: # docs/DeveloperGuide.adoc # src/main/java/seedu/address/MainApp.java # src/main/java/seedu/address/logic/parser/ParserUtil.java
# Conflicts: # docs/DeveloperGuide.adoc
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
new theme for UI
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
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
Update UG and ReadMe
task list edit/delete
add AddTaskCommandTest and relevant TaskBuilder
Fixed Todo list and task scheduling
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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