Change date format in fixture stub file
Adding simplecov
Merge pull request #20 from ndlib/adding-simplecov

Adding simplecov
adds a config parameter to enable ffmpeg (defaults to false); checks this config parameter in the transcode video job, aborting if false; checks this config parameter in the transcode video job spec, does not run spec if false
Merge pull request #22 from psu-stewardship/master

adds a config parameter to enable ffmpeg (defaults to false); checks this config parameter in the transcode video job, aborting if false; checks this config parameter in the transcode video job spec, does not run spec if false
GF controller spec should not assume uploaded and modified dates are arrays, as they are unique values
Merge pull request #23 from psu-stewardship/master

GF controller spec should not assume uploaded and modified dates are arrays, as they are unique values
changed format of value to array update
pointing at latest release of hydra-head as a dependency, and upping rails to 3.2.11, which has a few critical security fixes
Merge pull request #25 from psu-stewardship/master

sufia should use HH 5.4 and Rails 3.2.11
Merge pull request #18 from psu-stewardship/sul_fix

Allowing for values that are not arrays while showing metadata
Merge pull request #12 from ndlib/fixtures-time-format

Change date format in fixture stub file
Fixing the version tests so they work more simmilar to the UI.  Fixing the code to work with the UI and not throw an error when updating versions.
Merge pull request #26 from psu-stewardship/version_fix

New versions throw an error in the UI on GF edit
cherry-picking 5d0d784a3660: fixed horizontal image scaling
cherry-picking bc6428d441: Fixed else case in thumbnail generation
Merge pull request #27 from psu-stewardship/master

Cherry-picked commits to fix image scaling and thumbnailization
Merge remote-tracking branch 'curationexperts/master'

* curationexperts/master:
  cherry-picking bc6428d441: Fixed else case in thumbnail generation
  cherry-picking 5d0d784a3660: fixed horizontal image scaling
  Fixing the version tests so they work more simmilar to the UI.  Fixing the code to work with the UI and not throw an error when updating versions.
  pointing at latest release of hydra-head as a dependency, and upping rails to 3.2.11, which has a few critical security fixes
  changed format of value to array update
  GF controller spec should not assume uploaded and modified dates are arrays, as they are unique values
  adds a config parameter to enable ffmpeg (defaults to false); checks this config parameter in the transcode video job, aborting if false; checks this config parameter in the transcode video job spec, does not run spec if false
  Adding simplecov
  Change date format in fixture stub file