Skip to content

aBode 0.6 release#100

Merged
aperdec merged 96 commits into
masterfrom
develop
Oct 7, 2016
Merged

aBode 0.6 release#100
aperdec merged 96 commits into
masterfrom
develop

Conversation

@aperdec
Copy link
Copy Markdown
Owner

@aperdec aperdec commented Oct 7, 2016

No description provided.

aperdec and others added 30 commits September 27, 2016 11:32
fixed delete deficiency issue on work order
# Conflicts:
#	target/classes/ca/sheridancollege/controllers/HomeController.class
#	target/classes/ca/sheridancollege/dao/DAO.class
Elviis and others added 29 commits October 6, 2016 19:02
# Conflicts:
#	WebContent/WEB-INF/jsps/home.jsp
#	src/ca/sheridancollege/services/ControllerServices.java
#	target/classes/ca/sheridancollege/beans/Form.class
#	target/classes/ca/sheridancollege/config/security-context.xml
#	target/classes/ca/sheridancollege/controllers/HomeController.class
#	target/classes/ca/sheridancollege/dao/DAO.class
response for second image
may have an issue with builder ref number -- but it is there
added formatting to the deficiency lists in work order
added some formatting to the help page
# Conflicts:
#	WebContent/WEB-INF/jsps/selectReport.jsp
@aperdec aperdec merged commit a38bf79 into master Oct 7, 2016
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