Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: spike/macro-2
Commits on Jan 21, 2013
  1. Ross A. Baker
  2. Ross A. Baker
  3. Ross A. Baker
  4. Ross A. Baker
  5. Ross A. Baker

    Silence SIP-18.

    rossabaker authored
  6. Ross A. Baker

    Add macros project.

    rossabaker authored
Commits on Jan 15, 2013
  1. Ross A. Baker
  2. Ross A. Baker
  3. Ross A. Baker

    Merge branch 'develop_2.10' of github.com:/scalatra/scalatra into dev…

    rossabaker authored
    …elop_2.10
    
    Conflicts:
    	crosspaths.sbt
    	project/build.scala
  4. Ross A. Baker

    Merge branch 'develop_2.9' into develop_2.10

    rossabaker authored
    Conflicts:
    	project/build.scala
  5. Ross A. Baker
  6. Ivan Porto Carrero

    fix jvalue result for files

    casualjim authored
  7. Ivan Porto Carrero

    fix jvalue result for files

    casualjim authored
  8. Ross A. Baker

    Merge branch '2.0.x' into 2.1.x

    rossabaker authored
    Conflicts:
    	project/build.scala
  9. Ross A. Baker
  10. Ross A. Baker

    Merge branch '2.0.x' into 2.1.x

    rossabaker authored
    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
  11. Ross A. Baker
  12. Ross A. Baker

    Clear some warnings.

    rossabaker authored
  13. Ross A. Baker

    Servlet should be provided.

    rossabaker authored
  14. Ivan Porto Carrero
  15. Ivan Porto Carrero
  16. Ivan Porto Carrero
  17. Ivan Porto Carrero
  18. Ivan Porto Carrero
  19. Ivan Porto Carrero

    add crossVersion to build

    casualjim authored
  20. Ivan Porto Carrero
  21. Ivan Porto Carrero
  22. Ivan Porto Carrero
  23. Ivan Porto Carrero
  24. Ivan Porto Carrero
  25. Ivan Porto Carrero

    remove faulty repo

    casualjim authored
  26. Ivan Porto Carrero

    Remove file upload edits

    casualjim authored
  27. Ross A. Baker

    Merge branch 'develop_2.9' into develop_2.10

    rossabaker authored
    Conflicts:
    	project/build.scala
  28. Ross A. Baker

    Merge branch '2.1.x' into develop_2.9

    rossabaker authored
    Conflicts:
    	core/src/main/scala/org/scalatra/servlet/FileUploadSupport.scala
    	core/src/test/scala/org/scalatra/servlet/FileUploadSupportSpec.scala
    	project/build.scala
  29. Ross A. Baker

    Merge branch '2.0.x' into 2.1.x; fix multipart bug.

    rossabaker authored
    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
Something went wrong with that request. Please try again.