Updated the version number.
changes to how spring handles some configuration parameters, allowing for a configuration file external to the war to offer values (currently for db config).
changes to how spring handles some configuration parameters, allowing for a configuration file external to the war to offer values (currently for db config).
Merge branch 'master' of github.com:cens/ohmageServer into ohmage-2.16
Fixed a minor bug in campaign deletion.

In campaign deletion, some parameters would be checked even after the request had been failed. It's a minor issue because the request would still fail with a legitimate error message, but it wouldn't fail fast.
Removed the check for timestamps in the future.

We were preventing timestamps from being in the future for stream data. This restriction has been removed.

Closes #554
Added RunKeeper back into ohmage.

RunKeeper can now be queried by ohmage in a very specific, undocumented way. This is strictly for internal use, and can be generally ignored unless you know exactly what you are doing.

Closes #544
Initial, untested, commit for audio.

Audio prompts with a maximum duration field are now allowed. This has not yet been tested.
Added the audio input to the survey upload.

When uploading a survey response with audio data, the audio data will be saved as long as it's a multi-part form where the part has a content type that begins with "audio".
Removed useless whitespace.
Fixed the XML name of the audio prompt max duration.
Changed the number prompt to allow decimals.

A new property, 'whole_number', has been added to the decimal prompt type, which will indicate if the number must a whole number. If this is false or not given, it will default to allowing decimal numbers.
Tested the audio prompt type.

The audio prompt type should now be valid and uploading audio should work. Full end-to-end testing with the phone will need to be done. Also, there will need to be a new API for reading audio files.

Closes #540
The audio prompt has been tested and added.

The audio prompt can now be created and audio files can be uploaded as part of a prompt response. There still needs to be an API to read audio files, but that will be opened as a new issue.

Closes #540
Updated the build to compile to Java 7.

A complete regression test was not done, but it also seems a little unnecessary. The Servlet container must be running Java 7 or the app will not start.

Closes #557
Fixed a bug in survey response uploading.

If the campaign did not exist, an internal exception was being thrown. Now, the user will be notified.
Merge branch 'master' of github.com:cens/ohmageServer into ohmage-2.16
Added the configruation file.

A default configuration file, that should probably never need to be changed, exists in the WEB-INF/congif/default.properties. A new properties file may be added to a Linux machine at /etc/ohmag
e.properties and to a Windows machine at %PROGRAMDATA%\OpenmHealth\config\ohmage.properties.

Closes #518
Updated the build for the SSL version.

A fix was implemented in the non-SSL version, but not the SSL version.
Fixed an issue with decimals in number prompts.

Number prompts with arbitrarily long decimal responses were not being properly stored and retrieved.

References #539