Permalink
Commits on Sep 29, 2013
  1. Merge branch 'hotfix/28.1'

    Mike Jerome committed Sep 29, 2013
  2. Move temp image files away from output_images to limit accidental del…

    Mike Jerome committed Sep 29, 2013
    …etion
  3. Revert "Move temp image files away from output_images to limit accide…

    Mike Jerome committed Sep 29, 2013
    …ntal deletion"
    
    This reverts commit 52b8757.
  4. Move temp image files away from output_images to limit accidental del…

    Mike Jerome committed Sep 29, 2013
    …etion
Commits on May 15, 2013
  1. Merge branch 'release/28'

    Mike Jerome committed May 15, 2013
  2. Allow user images to have negative positioning

    Mike Jerome committed May 15, 2013
Commits on May 12, 2013
  1. Merge branch 'release/27' into develop

    Mike Jerome committed May 12, 2013
  2. Merge branch 'release/27'

    Mike Jerome committed May 12, 2013
  3. Allow text areas to be positioned with negative values

    Mike Jerome committed May 12, 2013
Commits on Apr 29, 2013
  1. Merge branch 'release/26' into develop

    Mike Jerome committed Apr 29, 2013
  2. Merge branch 'release/26'

    Mike Jerome committed Apr 29, 2013
  3. bv

    Mike Jerome committed Apr 29, 2013
  4. Use different method name from column name for blur

    Mike Jerome committed Apr 29, 2013
Commits on Apr 26, 2013
  1. Merge branch 'feature/blur' into develop

    Mike Jerome committed Apr 26, 2013
  2. Remove TIME TRACKING from repo

    Mike Jerome committed Apr 26, 2013
  3. Allow blurring of text_areas

    Mike Jerome committed Apr 26, 2013
Commits on Jan 21, 2013
  1. Merge branch 'release/25' into develop

    Mike Jerome committed Jan 21, 2013
  2. Merge branch 'release/25'

    Mike Jerome committed Jan 21, 2013
  3. bv

    Mike Jerome committed Jan 21, 2013
  4. Rename field to line spacing

    Mike Jerome committed Jan 21, 2013
  5. Rename method to be different from column name

    Mike Jerome committed Jan 21, 2013
  6. Merge branch 'release/24' into develop

    Mike Jerome committed Jan 21, 2013
  7. Merge branch 'release/24'

    Mike Jerome committed Jan 21, 2013
  8. bv

    Mike Jerome committed Jan 21, 2013
  9. Merge branch 'feature/line_height' into develop

    Mike Jerome committed Jan 21, 2013
  10. Update tt

    Mike Jerome committed Jan 21, 2013
  11. Document interline_spacing on text areas

    Mike Jerome committed Jan 21, 2013
  12. Add interline spacing to text areas

    Mike Jerome committed Jan 21, 2013
Commits on Jan 7, 2013
  1. Merge branch 'release/23' into develop

    Mike Jerome committed Jan 7, 2013
  2. Merge branch 'release/23'

    Mike Jerome committed Jan 7, 2013
  3. bv

    Mike Jerome committed Jan 7, 2013
  4. Merge branch 'feature/stagingftp' into develop

    Mike Jerome committed Jan 7, 2013
  5. Update time

    Mike Jerome committed Jan 7, 2013
  6. Crop user images after rotating them

    Mike Jerome committed Jan 7, 2013
  7. Document environment paramater

    Mike Jerome committed Jan 7, 2013