catching errors
Merge branch 'gary' of https://github.com/igemsoftware/UCSD-iGEM_2014 into Joaquin
"catching error merge"
Merge branch 'gary' of https://github.com/igemsoftware/UCSD-iGEM_2014 into Joaquin
added the PMID
Added complete database upload form with validation; dynamic plasmid, operon, input transition, input species, and output species fields; and modal error messages. Working on string parser for form.
almost done with password restriction
Merge branch 'Valeriy' of github.com:jenhantao/UCSD_IGEM into gary
Merge branch 'Joaquin' of github.com:jenhantao/UCSD_IGEM into gary
Prepping for pull from Joaquin. Strange behavior in netbeans noted and unknown changes to project.properties.
whole_network json can now filled with ids
Merge branch 'Joaquin' of github.com:jenhantao/UCSD_IGEM into gary
"obtained the edges from the paths and included them in the json."
Added PubMedId's to the app table as generated by the database. Resolved strange issue with netbeans.
upload page has bee update to make sure the promoter is stored under the input transition field.
fixed while loop problem and added log out to home page after log in
Finished adding database upload form, parser, and GET request template. Waiting for Valeriy's finished servlet method. Fixed aesthetic of main.js code structure by removing extra spacing from the left margin.
still having trouble with the file path for code.json
pycharm .idea folder
made tweak back to format Gary will return me.
Merge branch 'gary' of https://github.com/igemsoftware/UCSD-iGEM_2014 into Joaquin
Working on getting the upload page all set up.