Permalink
Commits on May 16, 2012
  1. Merge branch 'master' of git://github.com/colszowka/simplecov

    Conflicts:
    	.rvmrc
    Isaac Sanders committed May 16, 2012
Commits on May 10, 2012
  1. @colszowka
  2. @colszowka
  3. @colszowka
  4. @colszowka

    Updated Changelog formatting

    colszowka committed May 10, 2012
  5. @colszowka

    v0.6.4 hooray

    colszowka committed May 10, 2012
  6. @colszowka

    Updated Changelog

    colszowka committed May 10, 2012
  7. @colszowka

    Merge pull request #119 from mvz/fix-warnings

    Minimal fix for warnings
    colszowka committed May 10, 2012
  8. @colszowka

    Merge pull request #117 from Deradon/encoding-issues

    Encoding issues with iso-8859 encoded files
    colszowka committed May 10, 2012
  9. @colszowka
  10. @colszowka

    Merge pull request #128 from japgolly/nan_fix

    Prevent divisions by zero
    colszowka committed May 10, 2012
  11. @colszowka
  12. @colszowka

    Merge pull request #129 from shime/master

    link is dead so remove it
    colszowka committed May 10, 2012
  13. @colszowka

    Removed irc channel mention from README for now, it's pretty useless

    when I don't have the time to hang out there
    colszowka committed May 10, 2012
  14. @colszowka
  15. @colszowka

    Put the merge timeout cuke feature to sleep for 2 secs to ensure

    it also passes on powerful machines...
    colszowka committed May 10, 2012
  16. @colszowka

    Added appraisal gem for testing against different gem dependency vers…

    …ions.
    
    Also updated developer instructions in README and test setup both for local
    and CI.
    
    This became neccessary to ensure that older versions of multi_json are
    supported, see #132.
    colszowka committed May 10, 2012
  17. @colszowka

    Merge pull request #133 from nirvdrum/patch-1

    Grammar fix: it's "its."
    colszowka committed May 10, 2012
  18. @nirvdrum

    Grammar fix: it's "its."

    nirvdrum committed May 10, 2012
  19. @colszowka

    Added transparent compatibility with MultiJson legacy api for #132

    Original source for the updated API was #122.
    
    Also see sferik/rails@5e62670
    for the source implementation of this.
    colszowka committed May 10, 2012
  20. @colszowka
  21. Made rvmrc more flexible

    Isaac Sanders committed May 10, 2012
Commits on May 7, 2012
  1. @shime

    remove dead link

    shime committed May 7, 2012
Commits on May 4, 2012
  1. @japgolly

    Prevent divisions by zero

    japgolly committed May 4, 2012
Commits on Apr 20, 2012
  1. @colszowka

    Fixed formatting of changelog

    colszowka committed Apr 20, 2012
  2. @colszowka

    Version bump and changelog

    colszowka committed Apr 20, 2012
Commits on Apr 19, 2012
  1. @colszowka

    Merge pull request #122 from sferik/multi_json

    Use new MultiJson API
    colszowka committed Apr 19, 2012
Commits on Apr 18, 2012
  1. @sferik

    Use new MultiJson API

    sferik committed Apr 18, 2012
Commits on Mar 30, 2012
  1. @colszowka

    Updated LICENSE

    colszowka committed Mar 30, 2012
Commits on Mar 24, 2012
  1. @mvz
  2. @mvz
  3. @mvz

    Turn on warnings in tests.

    mvz committed Mar 22, 2012
Commits on Mar 22, 2012
  1. @colszowka
Commits on Mar 19, 2012
  1. @Deradon
  2. @Deradon