Permalink
Switch branches/tags
v2.5.0 v2.5.0-RC1 v2.4.1 v2.4.0 v2.4.0.RC3 v2.4.0.RC2 v2.4.0.RC2-2 v2.4.0.RC2-1 v2.4.0.RC1 v2.4.0.M3 v2.4.0.M2_2.11 v2.4.0.M2_2.10 v2.4.0.M1_2.11 v2.4.0.M1_2.10 v2.3.1 v.2.3.0 v.2.3.0.RC3 v2.3.0.RC2 v2.3.0.M1_2.10 v2.2.2_2.10 v2.2.2_2.9 v2.2.1_2.10 v2.2.1 v2.2.0 v2.1.2 v2.0.5 step_2.8.0.RC6-1.2.0 step_2.8.0.RC5-1.2.0 step_2.8.0.RC3-1.2.0 step_2.8.0.RC2-1.2.0 step_2.7.7-1.2.0 step-1.1.5 step-1.1 step-1.0 scalatra_2.9.1.RC4-2.0.0.RC1 scalatra_2.9.1-2.0.2 scalatra_2.9.1-2.0.1 scalatra_2.9.1-2.0.0 scalatra_2.9.0.1-2.0.0.M4 scalatra_2.9.0-2.0.2 scalatra_2.9.0-2.0.1 scalatra_2.9.0-2.0.0 scalatra_2.9.0-2.0.0.RC1 scalatra_2.9.0-2.0.0.M4 scalatra_2.9.0-1-2.0.2 scalatra_2.9.0-1-2.0.1 scalatra_2.9.0-1-2.0.0 scalatra_2.9.0-1-2.0.0.RC1 scalatra_2.9.0-1-2.0.0.M4 scalatra_2.8.2.RC1-2.0.0.RC1 scalatra_2.8.1-2.0.2 scalatra_2.8.1-2.0.1 scalatra_2.8.1-2.0.0 scalatra_2.8.1-2.0.0.RC1 scalatra_2.8.1-2.0.0.M4 scalatra_2.8.1-2.0.0.M3 scalatra_2.8.1-2.0.0.M2 scalatra_2.8.0.RC7-1.2.0 scalatra_2.8.0.RC6-1.2.0 scalatra_2.8.0-2.0.0.M3 scalatra_2.8.0-2.0.0.M2 scalatra_2.8.0-2.0.0.M1 scalatra_2.8.0-1.2.1 scalatra_2.7.7-1.2.1 scalatra_2.7.7-1.2.0 2.10_2.2.0 2.3.0.RC1 2.2.0_2.10-RC3 2.2.0-RC3 2.2.0-RC2 2.2.0-RC1 2.1.1 2.1.0 2.1.0.M2 2.1.0.M1 2.1.0-RC1 2.0.4 2.0.3 2.0.2 2.0.1_2.9 2.0.1_2.8 2.0.0_2.9 2.0.0_2.8 2.0.0.RC1_2.9 2.0.0.RC1_2.8 2.0.0.M4_2.9 2.0.0.M4_2.8 2.0.0.M3 2.0.0.M2 2.0.0.M1 1.2.1_2.8 1.2.1_2.7.7 1.2.0_step_2.8.0.RC6 1.2.0_step_2.8.0.RC5 1.2.0_step_2.8.0.RC3 1.2.0_step_2.8.0.RC2 1.2.0_step_2.7.7 1.2.0_scalatra_2.8.0.RC7 1.2.0_scalatra_2.8.0.RC6 1.2.0_scalatra_2.7.7
Nothing to show
Commits on Mar 23, 2015
  1. Merge pull request #484 from seratch/2.2.x_2.10

    Add Travis build settings
    seratch committed Mar 23, 2015
  2. Add Travis build settings

    seratch committed Mar 23, 2015
Commits on Jan 27, 2014
  1. Merge pull request #356 from dozed/2.2.x_2.10

    Added support to specify loadOnStartup.
    casualjim committed Jan 27, 2014
Commits on Jan 6, 2014
  1. Merge pull request #351 from smeagol74/2.2.x_2.10

    fixed ScalatraServlet.requestPath for encoded unicode URI
    casualjim committed Jan 6, 2014
  2. Update ApiFormats.scala

    casualjim committed Jan 6, 2014
Commits on Nov 24, 2013
  1. Bump to 2.2.3-SNAPSHOT.

    rossabaker committed Nov 24, 2013
  2. More release notes.

    rossabaker committed Nov 24, 2013
  3. Release 2.2.2.

    rossabaker committed Nov 24, 2013
  4. Issue #335 in release notes

    rossabaker committed Nov 24, 2013
  5. Merge branch '2.2.x_2.9' into 2.2.x_2.10

    Conflicts:
    	core/src/main/scala/org/scalatra/FutureSupport.scala
    rossabaker committed Nov 24, 2013
  6. Release note.

    rossabaker committed Nov 24, 2013
  7. Fix issue #321: the result of a Future can be another Future, so we u…

    …nroll them until we have an actual result
    rossabaker committed Nov 24, 2013
Commits on Nov 6, 2013
  1. Upgrade to Scalaz 7.0.4.

    rossabaker committed Nov 6, 2013
  2. This should allow using scalate with i18n support in ScalatraFilter a…

    …s well as in ScalatraServlet.
    tgregory committed with rossabaker Oct 22, 2013
  3. Remove unused import

    nicl committed with rossabaker Sep 24, 2013
  4. Fix atmosphere disconnect handling

    Only remove session attribute _after_ the client is retrieved from the session and sent the `Disconnected` message.
    Also removing the pointless first `isCancelled` check.
    Conflicts:
    	atmosphere/src/main/scala/org/scalatra/atmosphere/ScalatraAtmosphereHandler.scala
    momania committed with rossabaker Jul 23, 2013
  5. Merge branch '2.2.x_2.9' into 2.2.x_2.10

    Conflicts:
    	swagger/src/main/scala/org/scalatra/swagger/package.scala
    rossabaker committed Nov 6, 2013
  6. Merge branch '2.2.x_2.9' into 2.2.x_2.10

    Conflicts:
    	atmosphere/src/main/scala/org/scalatra/atmosphere/ScalatraAtmosphereHandler.scala
    	commands/src/main/scala/org/scalatra/commands/executors.scala
    	core/src/main/scala/org/scalatra/FutureSupport.scala
    	core/src/main/scala/org/scalatra/ScalatraBase.scala
    	core/src/test/scala/org/scalatra/ContentTypeTest.scala
    	scalate/src/main/scala/org/scalatra/scalate/ScalateSupport.scala
    	scalate/src/test/scala/org/scalatra/scalate/ScalateFuturesSupportSpec.scala
    rossabaker committed Nov 6, 2013