Fixed the concept numeric stats page - #1244

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6775 5bac5841-c719-aa4e-b3fe-cce5062f897a
Followup fix for the concept numeric stats page - #1244

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6777 5bac5841-c719-aa4e-b3fe-cce5062f897a
Updated some unit tests to the new "@verifies" format

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6779 5bac5841-c719-aa4e-b3fe-cce5062f897a
Removed the unnecessary zipping of jar files before packaging into the war

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6793 5bac5841-c719-aa4e-b3fe-cce5062f897a
Fixing UserService unit test error from previous commit.

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6816 5bac5841-c719-aa4e-b3fe-cce5062f897a
Minor fix for CohortService and Concept/CohortService unit tests

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6835 5bac5841-c719-aa4e-b3fe-cce5062f897a
Added patch for tasks to run concurrently in different threads and to initialize concurrently in different threads - #1056
Added unit tests for scheduler changes
Author: Knoll_Frank

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6836 5bac5841-c719-aa4e-b3fe-cce5062f897a
Fixing #1260 - Duplicate values in lab results table in graphs portlet on patient dashboard

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6846 5bac5841-c719-aa4e-b3fe-cce5062f897a
Added PatientService getPatient test for null

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6854 5bac5841-c719-aa4e-b3fe-cce5062f897a
Fixing install wizard creation of user for later versions of mysql - #1264
Author: wchoi

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6867 5bac5841-c719-aa4e-b3fe-cce5062f897a
Moved merge patients link to admin page - #1249
Author: clare

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6868 5bac5841-c719-aa4e-b3fe-cce5062f897a
Increased the time limit for scheduler service test to allow both threads to finish

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6869 5bac5841-c719-aa4e-b3fe-cce5062f897a
Added check in mergePatient api method to refuse merging a patient to itself - #1143
Author: strategist333

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6870 5bac5841-c719-aa4e-b3fe-cce5062f897a
Modified the ConceptServiceTest and EncounterServiceTest to use the new @verifies annotation

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6871 5bac5841-c719-aa4e-b3fe-cce5062f897a
Added check for empty mysql user password - #1265
Author: wiltzius

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6872 5bac5841-c719-aa4e-b3fe-cce5062f897a
applying patch for ticket #1270, fixing an edge case regarding not specifying the form_id
Author: wmrowan

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6874 5bac5841-c719-aa4e-b3fe-cce5062f897a
Added start and end date options to the voided obs quick report - #1037
Author: cnaut

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6876 5bac5841-c719-aa4e-b3fe-cce5062f897a
applying patch to fix tickets #462 and #461.  adds spring codes to several phrases that did not previous have spring codes.
Author: anuraag

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6877 5bac5841-c719-aa4e-b3fe-cce5062f897a
Added visible select-multi to schema designer - #1021
Author: ewolodzko

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6878 5bac5841-c719-aa4e-b3fe-cce5062f897a
fix for ticket #464, adds some spring message codes for former free text
Author: anuraag

git-svn-id: http://svn.openmrs.org/openmrs/trunk@6879 5bac5841-c719-aa4e-b3fe-cce5062f897a