Commits on Jun 24, 2012
  1. @rktoomey
  2. @rktoomey
Commits on Jun 23, 2012
  1. @rktoomey
  2. @rktoomey
  3. @rktoomey

    Merge branch 'master' into 0.0.8_2.9.0-1

    Conflicts:
    	project/SalatBuild.scala
    rktoomey committed Jun 23, 2012
  4. @rktoomey

    Updating version to 0.0.8

    rktoomey committed Jun 23, 2012
Commits on Jun 22, 2012
  1. @rktoomey

    Merge branch 'master' into 0.0.8_2.9.0-1

    Conflicts:
    	salat-core/src/main/scala/com/novus/salat/json/ToJValue.scala
    rktoomey committed Jun 22, 2012
  2. @rktoomey
  3. @rktoomey
  4. @rktoomey

    error -> sys.error

    rktoomey committed Jun 21, 2012
  5. @rktoomey
  6. @rktoomey
  7. @rktoomey

    scaladoc on JSON methods

    rktoomey committed Jun 21, 2012
  8. @rktoomey

    Merge branch 'master' into 0.0.8_2.9.0-1

    Conflicts:
    	salat-core/src/main/scala/com/novus/salat/Grater.scala
    rktoomey committed Jun 21, 2012
  9. @rktoomey

    JSON list support

    rktoomey committed Jun 21, 2012
Commits on Jun 19, 2012
  1. @rktoomey

    Merge branch 'master' into 0.0.8_2.9.0-1

    Conflicts:
    	salat-core/src/main/scala/com/novus/salat/json/JSONConfig.scala
    rktoomey committed Jun 19, 2012
  2. @rktoomey

    JSON date strategy spec

    rktoomey committed Jun 19, 2012
Commits on Jun 17, 2012
  1. @rktoomey
Commits on Jun 15, 2012
  1. @rktoomey

    Added fromJSON, to/from Map to ModelCompanion. Updated oid type mache…

    …r with Casbah commons type.
    rktoomey committed Jun 15, 2012
  2. @rktoomey
Commits on Jun 13, 2012
  1. @rktoomey
  2. @rktoomey
Commits on Jun 12, 2012
  1. @rktoomey
  2. @rktoomey

    Argh. DateTime formatting fix for test data. Added @Salat annotation …

    …to top-levels of test class hierarchies.
    rktoomey committed Jun 12, 2012
  3. @rktoomey
  4. @rktoomey

    More date time formatting hijinks. Now comparison of serialized dates…

    … uses a string as the expected value.
    rktoomey committed Jun 12, 2012
  5. @rktoomey

    Merge branch 'master' into 0.0.8_2.9.0-1

    Conflicts:
    	salat-core/src/main/scala/com/novus/salat/json/ToJValue.scala
    rktoomey committed Jun 12, 2012
  6. @rktoomey
  7. @rktoomey
  8. @rktoomey
Commits on Jun 8, 2012
  1. @rktoomey

    Salat 2.9.x branch updated to 2.9.2; cross builds for 2.9.1 and 2.9.2…

    …. TODO: casbah-core, lift-json still don't have 2.9.2 available
    rktoomey committed Jun 8, 2012
  2. @rktoomey
  3. @rktoomey

    Merge branch 'master' into 0.0.8_2.9.0-1

    Conflicts:
    	salat-core/src/main/scala/com/novus/salat/Grater.scala
    rktoomey committed Jun 8, 2012
  4. @rktoomey
Commits on Jun 6, 2012
  1. @rktoomey