The Upload widget is being rendered correctly. Images are getting Uploaded to correct location.
The Upload widget is being rendered correctly. Images are getting Uploaded to correct location.
& few minor changes
Merge branch 'zephyr' of https://github.com/jibesh/openmrs-module-htmlformentry into zephyr

Conflicts:
	omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java
Minor Changes regarding the filepath
All types of files are getting uploaded & rendered correctly
Merge remote-tracking branch 'upstream/master' into zephyr-updated

Conflicts:
	api/src/main/java/org/openmrs/module/htmlformentry/FormEntryContext.java
	api/src/main/java/org/openmrs/module/htmlformentry/HtmlFormEntryUtil.java
	api/src/main/java/org/openmrs/module/htmlformentry/element/ObsSubmissionElement.java
	api/src/test/java/org/openmrs/module/htmlformentry/WidgetTest.java
	omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java
	omod/src/main/webapp/htmlFormEntry.jsp
TESTS running fine in with configuration 1.9 & 1.8
Wrote the tests
Everything running fine in openmrs 1.6, 1.8, 1.9 configurations
Removing a small bug
merged in latest trunk branch
made various formatting changes
initial commit
- Merged branch 'complex_obs_tag' with latest trunk
- made various code improvements
forgot to put in multipart form submission

fixed editing/replacing complex obs
HTML-525 - Support not displaying an obs group tag in view mode if no data was entered
Merge branch 'master' into HTML-314
Merge pull request #67 from wesleysee/HTML-314

Html 314: Upload and View File tag in HTMLForm Entry Module
HTML-528 - Number field should redisplay whole numbers without ".0" after them
HTML-528 - Fix to tests I broken when changing number field to redisplay whole numbers without ".0"
localize some hard-coded text for complex upload widget
Merge pull request #68 from wesleysee/master

localize some hard-coded text for complex upload widget