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

Larry #169

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

Larry #169

wants to merge 348 commits into from

Conversation

nuslarry
Copy link

dynamic tasks on clender

tylerrocha and others added 30 commits March 10, 2017 20:27
@tylerrocha
create XmlTaskListStorageTest.java to replace XmlAddressBookStorageTest
2169018
@tylerrocha
remove XmlAddressBookStorageTest
50d9da4
@tylerrocha
replace person with task in XmlSerializableTaskList.java
f1862bb
@tylerrocha
remove apostrophe from task descriptions in TypicalTestTasks.java
b698df4
@tylerrocha
add back ida and hoon to pass test
b567ec1
@tylerrocha
add NotXmlFormatTaskList.xml
26756cd
@tylerrocha
remove NotXmlFormatAddressBook.xml; pass all 19 storage tests
0513e59
@tylerrocha
remove trailing whitespace
79dad5b
@tylerrocha
remove more trailing whitespace
8f5c2de
@tylerrocha
reorder AddCommand imports
9e0cbee
@tylerrocha
reorder EditCommand imports
cb5325e
@tylerrocha
reorder more imports
ef53289
@tylerrocha
reorder even more imports
f6d7933
@tylerrocha
fix more checkstyle things
f535d20
@tylerrocha
fix checkstyle problems in test folder
80302b4
@tylerrocha
remove unused variable in TaskDate
a2214a6
@tylerrocha
remove unused import in TaskDate
6fecdc0
@tylerrocha
remove underscores from method names
554968e
@tylerrocha
add assert to test readTaskListNullFilePathAssertionFailure()
26c52b2
@tylerrocha
add fail() to tests which check for thrown exceptions
a07348a
@tylerrocha
add one more fail()
69a4b2e
@tylerrocha
remove unused variable 'address'
90d9e8f
@tylerrocha
Merge pull request #28 from CS2103JAN2017-T11-B3/storage
8f00e22 
pass storage tests
@whyCaiJi
Modified AddCommandParser, Priority and TaskDate to enable adding flo…
316d48c 
…ating tasks
@whyCaiJi
Renaming message string for deleting and finding index
9c17b3a
@whyCaiJi
Implement the edit command (only functionality)
2a7a9e7
@whyCaiJi
Edit command fully implemented in TaskManger context
b531e3f
@whyCaiJi
Minor modification on EditCommandTest file
824f416
@whyCaiJi
Fix Travis build issue
42704a8
@whyCaiJi
Should be final fix on checkstyle
9f6ebca
tylerrocha and others added 19 commits March 24, 2017 00:37
@tylerrocha
fix npe on exit by removing all old references to BrowserPanel
909b8a9
@tylerrocha
Merge branch 'master' into patch_exit
44c43d0
@tylerrocha
Merge pull request #85 from CS2103JAN2017-T11-B3/patch_exit
93d0a14 
fix npe on exit by removing all old references to BrowserPanel
@jay500s
Added functionality to validate start/end time ordering
b009400
@jay500s
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main …
41dc2ea 
…into jay2
@jay500s
Logic for edit command to check start/end timings.
6803d96 
GUI tests for add command to check timing order
@jay500s
codacy fixes in TimingTest
1a0455c
@jay500s
Merge pull request #81 from CS2103JAN2017-T11-B3/jay2
9d94c32 
Jay2
@tylerrocha
add collate jar and script
72725e6
@tylerrocha
add collate script results
d31bdda
@tylerrocha
try to ignore collated files in coveralls scan
537ca6b
@tylerrocha
add slashes to .simplecov
c305d20
@tylerrocha
try one more .simplecov variation
7ac6d83
@whyCaiJi
Implemented Undo/Redo feature
6dff942
@whyCaiJi
Trying to solve merge conflict
ab219b2
@tylerrocha
Merge pull request #101 from CS2103JAN2017-T11-B3/collate
4e2bc1b 
Add collated files
@jay500s
updated about us (for Jay)
5b711e4
@jay500s
jay_about us page
4d5e1a5
dynamic tasks on calender
b3fde66
@nus-se-pr-bot
Copy link

Hi @nuslarry, your pull request title is invalid. It should be in the format of [Activity ID][Team ID] Your name, where [Activity Id] has no dashes or spaces (e.g. [T2A3] stands for Tutorial 2 Activity 3) and [Team ID] has one dash only and no spaces (e.g. [W14-A2] means Wednesday 2pm (14 hrs), Phase A, Team 2). Please follow the instructions given strictly and edit your title for reprocessing.

Submit only one activity per pull request (unless otherwise stated in instructions) and do remember to create your branches from the commit where the master branch is pointing at so that each PR you submit only consist of commits meant for the activity.

Note: this comment is posted by a bot. If you believe this is done in error, please create an issue at cs2103-pr-bot and add a link to this PR.

joelleejh added a commit to joelleejh/addressbook-level4 that referenced this pull request Apr 10, 2017
@joelleejh
Merge pull request nus-cs2103-AY1617S2#169 from KohJunWei/master
561ccb9 
Edited User Guide and cleanup and refactoring of code
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
FormatCheckRequested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nuslarry @nus-se-pr-bot @tylerrocha @whyCaiJi @jay500s