Commits on Nov 16, 2012
  1. @guillaumebort

    2.1-RC1 package

    guillaumebort committed Nov 16, 2012
  2. @jroper
  3. @jroper

    Merge pull request #536 from acollign/fix_docs

    Fix wrong inputDate documentation. Related to #852
    jroper committed Nov 15, 2012
Commits on Nov 15, 2012
  1. @sadache

    missing file

    sadache committed Nov 15, 2012
  2. @sadache

    moving util to functional

    sadache committed Nov 15, 2012
  3. @guillaumebort
  4. @acollign @acollign
Commits on Nov 14, 2012
  1. @pk11

    fix link for multi-project demo

    pk11 committed Nov 14, 2012
  2. @pk11
  3. @pk11

    documentation changes

    - add back java injection page
    - add `highlights` page
    pk11 committed Nov 14, 2012
  4. @guillaumebort

    Merge pull request #537 from pk11/incremental-asset-default

    turn on incrementalAssetsCompilation by default
    guillaumebort committed Nov 14, 2012
Commits on Nov 13, 2012
  1. @jroper

    Merge pull request #531 from arruda/patch-1

    Update documentation/manual/javaGuide/tutorials/zentasks/JavaGuide4.md
    jroper committed Nov 13, 2012
  2. @pk11
  3. @pk11

    update requirejs doc

    pk11 committed Nov 13, 2012
  4. @pk11

    Merge pull request #538 from deansher/dist-from-packaged-artifacts-2

    "dist" command should package all jars
    pk11 committed Nov 13, 2012
  5. Changed playPackageEverythingTask to package jar files returned from …

    …the packagedArtifacts task, instead of just the packageBin artifact.
    Dean Thompson committed Nov 8, 2012
  6. @pk11

    fix 'deprecated' annotation

    pk11 committed Nov 13, 2012
  7. @pk11
  8. @pk11

    Merge pull request #530 from jroper/test-improvements

    Test improvements
    pk11 committed Nov 13, 2012
Commits on Nov 12, 2012
  1. @guillaumebort
  2. @guillaumebort

    Merge pull request #534 from pk11/requirejs-helper

    keep original javascript files when doing require js processing
    guillaumebort committed Nov 12, 2012
  3. @pk11

    keep original javascript files when doing require js processing

    - keep javascripts-min folder
    - add requireJs helper to deal with switching between dev and prod mode
    pk11 committed Nov 12, 2012
  4. @guillaumebort

    Merge pull request #529 from jamesward/skeletons-gitignore-more

    Add the Eclipse .settings dir to the .gitignore file
    guillaumebort committed Nov 12, 2012
Commits on Nov 11, 2012
  1. @arruda

    Update documentation/manual/javaGuide/tutorials/zentasks/JavaGuide4.md

    Fixing small typo in docs: instead of username was usename.
    arruda committed Nov 11, 2012
Commits on Nov 10, 2012
  1. @sadache

    Merge pull request #528 from mandubian/exp-1

    Json extensions (experimental)
    sadache committed Nov 10, 2012
  2. @jroper

    Test improvements

    * Fixed bug in WithApplication/Server/Browser around scopes where the around() method was being invoked twice
    * Modified integrationtest to use WithApplication/Server/Browser
    * Modified TestBrowser so that it would set a default base URL for relative URLs in Fluentlenium, and made it use the one provided by WithBrowser
    jroper committed Nov 10, 2012
Commits on Nov 9, 2012
  1. @guillaumebort

    Fix the tests

    guillaumebort committed Nov 9, 2012
  2. @guillaumebort

    - Integrate the `Filters` feature into the main project

    - Allow the Java Global API to enable Filters
    - Allow to retrieve an implicit RequestHeader in Java templates
    
    Conflicts:
    	framework/src/sbt-plugin/src/main/scala/PlayKeys.scala
    guillaumebort committed Nov 6, 2012
  3. @guillaumebort
  4. @guillaumebort
  5. @guillaumebort

    Merge pull request #511 from guillaumebort/fixReloading

    Fix dev reloading for system which doesn't support JNotify
    guillaumebort committed Nov 9, 2012
  6. @guillaumebort

    Merge pull request #518 from guillaumebort/requireJS

    Change the requireJsSupport:Boolean setting to requireJs:Seq[String]
    guillaumebort committed Nov 9, 2012
  7. @guillaumebort

    Merge pull request #526 from jamesward/skeletons-spacing-fix

    make skeleton spacing more consistent with language norms
    guillaumebort committed Nov 9, 2012
  8. @guillaumebort

    Merge pull request #525 from jroper/reflections-cache

    Added reflections cache for fast ebean test startup
    guillaumebort committed Nov 9, 2012
  9. @mandubian