Skip to content

Master #167

Closed
wants to merge 234 commits into from
Closed

Master #167

wants to merge 234 commits into from

Conversation

mxd12001
Copy link
Collaborator

No description provided.

jic13003 and others added 30 commits January 31, 2017 20:33
Attribute changed and this is catching up.
It also now closes when pressing escape or clicking outside of it.

Made shoppingCart.html and shoppingCart.js into shoppnigCart.jsp and shop.jsp respetively; getting ready for database stuff
Minor DB Class Changes. Also cats
Getting the image to show is troubling. Reorganization is probably the
best solution.
Eclipse Debugging = 💩
Also merged together two JSP files. No need to separate.
Submitting the form does not do everything it needs to do with tables yet. There is a good deal of polishing and refactoring to now too.
Also some code clean up :)
Hopefully won't mess with what anyone else is doing
John's-Branch

# Conflicts:
#	WebContent/html/javascript/listing.jsp
clj13001 and others added 29 commits April 20, 2017 21:35
Still needs a bit of extra work
Submit button is disabled when nothing is selected. Return defaults to today.

Request page shows all devices by default
@clj13001 clj13001 closed this Apr 25, 2017
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants