Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 24, 2013
  1. @rktoomey

    Merge pull request #92 from edmondo1984/salat_2.10

    rktoomey authored
    Fixed priority of custom transformer over case classes
Commits on Aug 20, 2013
  1. @rktoomey

    Fix readme

    rktoomey authored
  2. @rktoomey

    Merge remote-tracking branch 'origin/master' into salat_2.10

    rktoomey authored
    Conflicts:
    	project/SalatBuild.scala
  3. @rktoomey

    Update README

    rktoomey authored
  4. @rktoomey

    Publish 1.9.2

    rktoomey authored
  5. @rktoomey
Commits on Jul 17, 2013
  1. @edmondo1984
Commits on Jul 11, 2013
  1. @rktoomey

    Merge remote-tracking branch 'origin/master' into salat_2.10

    rktoomey authored
    Conflicts:
    	salat-core/src/main/scala/com/novus/salat/transformers/CustomTransformer.scala
  2. @rktoomey

    Merge remote-tracking branch 'origin/master' into salat_2.10

    rktoomey authored
    Conflicts:
    	salat-core/src/main/scala/com/novus/salat/transformers/CustomTransformer.scala
Commits on Jul 10, 2013
  1. @rktoomey

    Top level support for custom transformers; specs using a custom trans…

    rktoomey authored
    …former with Scala and Java classes.
Commits on Jun 21, 2013
  1. @rktoomey

    Update LICENSE.md

    rktoomey authored
    Updated copyright year
Commits on Jun 6, 2013
  1. Merge branch 'master' into salat_2.10

    rose authored
  2. Revise casbah deps - depend on casbah-core, not aggregator pom; scope…

    rose authored
    … casbah-commons dep to test
  3. @rktoomey
  4. @rktoomey
  5. @rktoomey

    Merge remote-tracking branch 'origin/master' into salat_2.10

    rktoomey authored
    Conflicts:
    	project/SalatBuild.scala
  6. @rktoomey
Commits on Jun 5, 2013
  1. @rktoomey

    Merge branch 'master' into salat_2.10

    rktoomey authored
    Conflicts:
    	project/SalatBuild.scala
    	project/plugins.sbt
    	salat-core/src/main/scala/com/novus/salat/conversions/JodaDateTimeZoneHelpers.scala
    	salat-core/src/main/scala/com/novus/salat/dao/SalatMongoCursor.scala
    	salat-core/src/main/scala/com/novus/salat/json/JSONConfig.scala
    	salat-core/src/main/scala/com/novus/salat/transformers/inject/Injectors.scala
    	salat-core/src/test/scala/com/novus/salat/test/IgnoreAnnotationSpec.scala
    	salat-core/src/test/scala/com/novus/salat/test/KeyAnnotationSpec.scala
    	salat-core/src/test/scala/com/novus/salat/test/dao/AlphaDAO.scala
    	salat-core/src/test/scala/com/novus/salat/test/dao/ChildCollectionSpec.scala
    	salat-core/src/test/scala/com/novus/salat/test/dao/ModelCompanionSpec.scala
    	salat-core/src/test/scala/com/novus/salat/test/dao/MyModel.scala
    	salat-core/src/test/scala/com/novus/salat/test/model/TestModel.scala
    	salat-core/src/test/scala/com/novus/salat/test/test.scala
  2. @rktoomey

    Merge branch 'master' into salat_2.10

    rktoomey authored
    Conflicts:
    	project/SalatBuild.scala
    	project/plugins.sbt
    	salat-core/src/main/scala/com/novus/salat/conversions/JodaDateTimeZoneHelpers.scala
    	salat-core/src/main/scala/com/novus/salat/dao/SalatMongoCursor.scala
    	salat-core/src/main/scala/com/novus/salat/json/JSONConfig.scala
    	salat-core/src/main/scala/com/novus/salat/transformers/inject/Injectors.scala
    	salat-core/src/test/scala/com/novus/salat/test/IgnoreAnnotationSpec.scala
    	salat-core/src/test/scala/com/novus/salat/test/KeyAnnotationSpec.scala
    	salat-core/src/test/scala/com/novus/salat/test/dao/AlphaDAO.scala
    	salat-core/src/test/scala/com/novus/salat/test/dao/ChildCollectionSpec.scala
    	salat-core/src/test/scala/com/novus/salat/test/dao/ModelCompanionSpec.scala
    	salat-core/src/test/scala/com/novus/salat/test/dao/MyModel.scala
    	salat-core/src/test/scala/com/novus/salat/test/model/TestModel.scala
    	salat-core/src/test/scala/com/novus/salat/test/test.scala
  3. @rktoomey
  4. @rktoomey

    Update casbah dependencies to 2.6.1, including test dependency on cas…

    rktoomey authored
    …bah-commons test jar for specs2 helpers.
Commits on May 13, 2013
  1. @rktoomey
  2. @rktoomey

    Updated casbah dep to 2.6.0.

    rktoomey authored
Commits on Feb 26, 2013
  1. @rktoomey

    Added spec showing that deserializing Option[ObjectId] works for both…

    rktoomey authored
    … string and strict strategies for #79
  2. @rktoomey

    Added spec showing that deserializing Option[ObjectId] works for both…

    rktoomey authored
    … string and strict strategies for #79
Commits on Feb 25, 2013
  1. @rktoomey
  2. @rktoomey
Commits on Feb 15, 2013
  1. @rktoomey
  2. @rktoomey
  3. @rktoomey

    Fix DateTimeZoneSpec by adding an explicit extractor that serializes …

    rktoomey authored
    …a DateTimeZone as its ID.
    
    Conflicts:
    	salat-core/src/test/scala/com/novus/salat/test/DateTimeZoneSpec.scala
  4. @rktoomey

    Update README

    rktoomey authored
  5. @rktoomey

    Merge branch 'master' into salat_2.10

    rktoomey authored
    Conflicts:
    	project/SalatBuild.scala
  6. @rktoomey

    Merge branch 'master' into salat_2.10

    rktoomey authored
    Conflicts:
    	project/SalatBuild.scala
  7. @rktoomey

    Scalariform

    rktoomey authored
  8. @rktoomey

    #75 - fix aggregator package - thanks to @rozza

    rktoomey authored
    (cherry-picked from 5467df4)
Something went wrong with that request. Please try again.