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

Fix Client Panel and Enhance Equipment Details #185

Merged
merged 21 commits into from
Apr 14, 2019

Conversation

racheltanxueqi
Copy link

No description provided.

@racheltanxueqi racheltanxueqi added type.Enhancement An enhancement to an existing story priority.High documentation Label for documentation update type.bug A bug. issue type type.Task Something that needs to be done, but not a story, bug, or an epic. e.g. Move testing code into a new type.Story A user story v1.4 labels Apr 12, 2019
@racheltanxueqi racheltanxueqi added this to the v1.4 milestone Apr 12, 2019
@racheltanxueqi racheltanxueqi self-assigned this Apr 12, 2019
racheltanxueqi and others added 11 commits April 13, 2019 03:08
 Conflicts:
	src/main/java/seedu/equipment/model/Model.java
	src/test/java/seedu/equipment/logic/commands/AddClientCommandTest.java

 Changes to be committed:
	modified:   src/main/java/seedu/equipment/logic/commands/DisplayCommand.java
	modified:   src/main/java/seedu/equipment/logic/commands/RouteCommand.java
	modified:   src/main/java/seedu/equipment/model/Model.java
	modified:   src/main/java/seedu/equipment/model/ModelManager.java
	modified:   src/main/java/seedu/equipment/ui/BrowserPanel.java
	modified:   src/test/java/seedu/equipment/logic/commands/AddCommandTest.java
	modified:   src/test/java/seedu/equipment/logic/commands/AddWorkListCommandTest.java
	modified:   src/test/java/systemtests/DisplayCommandSystemTest.java
	modified:   src/test/java/systemtests/RouteCommandSystemTest.java
@racheltanxueqi racheltanxueqi merged commit ee8db12 into master Apr 14, 2019
@racheltanxueqi racheltanxueqi deleted the client-equipments branch April 14, 2019 05:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Label for documentation update priority.High type.bug A bug. issue type type.Enhancement An enhancement to an existing story type.Story A user story type.Task Something that needs to be done, but not a story, bug, or an epic. e.g. Move testing code into a new v1.4
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants