Permalink
Commits on Sep 23, 2011
  1. Merge branch 'support/2.0.x' into develop

    Conflicts:
    	project/build.scala
    rossabaker committed Sep 23, 2011
  2. Bump to 2.0.2-SNAPSHOT.

    rossabaker committed Sep 23, 2011
Commits on Sep 22, 2011
  1. Release Scalatra 2.0.1.

    rossabaker committed Sep 22, 2011
  2. Upgrade to Specs2 1.6.1.

    rossabaker committed Sep 22, 2011
Commits on Sep 21, 2011
Commits on Sep 20, 2011
  1. Use request.body

    casualjim committed Sep 20, 2011
Commits on Sep 17, 2011
  1. Merge branch 'master' into develop

    Conflicts:
    	core/src/main/scala/org/scalatra/GetResponseStatusSupport.scala
    	project/build.scala
    rossabaker committed Sep 17, 2011
Commits on Sep 16, 2011
  1. Release Scalatra 2.0.0.

    rossabaker committed Sep 16, 2011
Commits on Sep 14, 2011
  1. fix socketio dependency

    casualjim committed Sep 14, 2011
Commits on Sep 12, 2011
  1. Upgrade to Scalate 1.5.2.

    rossabaker committed Sep 12, 2011
  2. [breaking][trivially] ScalatraTests support for Jetty7 and Jetty8. [f…

    …ixes #129]
    
    The signature of addFilter changed incompatibly from Jetty7 to Jetty8.
    This is a reprehensible hack to support both with the same version of
    Scalatra.  We don't need to add any more Cross Build Hell.™
    
    If this broke your code, replace:
        import org.eclipse.jetty.server.DispatcherType
    with
        import org.scalatra.test.DispatcherType
    rossabaker committed Sep 12, 2011
Commits on Sep 10, 2011
  1. Merge branch 'develop' of github.com:scalatra/scalatra into develop

    Conflicts:
    	project/build.scala
    rossabaker committed Sep 10, 2011
  2. Merge branch 'support/2.0.x' into develop

    Conflicts:
    	core/src/main/scala/org/scalatra/GetResponseStatusSupport.scala
    	project/build.scala
    rossabaker committed Sep 10, 2011
  3. Release notes for 2.0.0.

    rossabaker committed Sep 10, 2011
  4. Remove Scala 2.8.2.RC1 support. We will retro-release for 2.8.2-final.

    2.8.2.RC1 is complicating our build.  Our dependencies aren't publishing for it
    yet, so you might as well just use scalatra_2.8.1 for now.  As soon as our
    dependencies have published for 2.8.2, we'll release off the 2.0.x branch.
    rossabaker committed Sep 10, 2011
Commits on Sep 9, 2011
  1. Cherry-picks apiformats fix

    casualjim committed Sep 9, 2011
Commits on Sep 8, 2011
Commits on Sep 7, 2011
  1. Updates lift version

    casualjim committed Sep 7, 2011
  2. updates lift version

    casualjim committed Sep 7, 2011
Commits on Sep 6, 2011