Permalink
Switch branches/tags
Commits on Feb 6, 2013
  1. Use snapshot again

    casualjim committed Feb 6, 2013
  2. bump version

    casualjim committed Feb 6, 2013
  3. go for snapshot again

    casualjim committed Feb 6, 2013
  4. put version to 2.1.2

    casualjim committed Feb 6, 2013
Commits on Feb 4, 2013
Commits on Jan 15, 2013
  1. Merge branch '2.0.x' into 2.1.x

    rossabaker committed Jan 15, 2013
    Conflicts:
    	project/build.scala
  2. Merge branch '2.0.x' into 2.1.x

    rossabaker committed Jan 15, 2013
    Conflicts:
    	example/src/main/scala/org/scalatra/ChatServlet.scala
    	lift-json/src/main/scala/org/scalatra/liftjson/LiftJsonRequestBody.scala
    	project/build.scala
    	test/src/main/scala/org/scalatra/test/Reflection.scala
  3. Clear some warnings.

    rossabaker committed Jan 15, 2013
  4. Merge branch '2.0.x' into 2.1.x; fix multipart bug.

    rossabaker committed Jan 15, 2013
    Jetty 8.1.8 uncovered a bug in FileUploadSupport where we tried
    to get the parts of a single-part request.  Fixed in this commit
    to be green.
    
    Conflicts:
    	project/Unidoc.scala
    	project/build.scala
Commits on Jan 14, 2013
  1. Merge branch '2.0.x' into 2.1.x

    rossabaker committed Jan 14, 2013
    Conflicts:
    	project/build.scala
  2. Merge branch '2.0.x' into 2.1.x

    rossabaker committed Jan 14, 2013
    Conflicts:
    	project/build.scala
    	project/plugins.sbt
Commits on Jan 11, 2013
  1. Port to Scala 2.10.

    rossabaker committed Jan 11, 2013
Commits on Jan 10, 2013
  1. Remove deprecated Scala Tools repo.

    rossabaker committed Jan 10, 2013
    Was only needed for 2.8.2, which is no longer supported.
  2. Bump to SBT 0.12.1.

    rossabaker committed Jan 10, 2013
  3. Revert "Use any instead of anyref for an attributes map"

    rossabaker committed Jan 10, 2013
    Save API changes for 2.2.x.
    
    This reverts commit eca1ad2.
Commits on Sep 1, 2012
  1. bump version

    casualjim committed Sep 1, 2012
Commits on Aug 13, 2012
Commits on Aug 12, 2012
  1. Prepares for 2.1.0 release

    casualjim committed Aug 12, 2012
  2. Render valid XML for a JValue serialization.

    casualjim committed Aug 12, 2012
    Better JsonP support with the correct mime type
    Use writer instead of string serialization.