Commits on Apr 6, 2013
  1. @fmpwizard

    Prepare for 2.5-RC4

    fmpwizard committed Apr 5, 2013
Commits on Apr 5, 2013
  1. @dpp
Commits on Mar 22, 2013
  1. @dpp

    Merge pull request #1424 from taylorleese/master

    Adds lift-json-scalaz7 (Scalaz 7 support). Based on Joni's mailing list thumbs up, I'm applying the patch
    dpp committed Mar 22, 2013
  2. Update contributors

    Taylor Leese committed Mar 21, 2013
  3. Merge branch 'scalaz-seven'

    Taylor Leese committed Mar 21, 2013
  4. Revert "Move lift-json-scalaz to Scalaz 7"

    This reverts commit 765ae74.
    Taylor Leese committed Mar 21, 2013
  5. Adds lift-json-scalaz7 (Scalaz 7 support).

    * Adds a new submodule for lift-json-scalaz7.
    * Maintains lift-json-scalaz for Scalaz 6 support.
    * Updated README to correspond to Scalaz 7.
    Taylor Leese committed Mar 21, 2013
Commits on Mar 20, 2013
  1. Move lift-json-scalaz to Scalaz 7

    * All tests pass, but only compiling for Scala 2.10.0 at the moment.
    * May need a lift-json-scalaz7 subproject to provide both Scalaz 6 and Scalaz 7 support.
    Taylor Leese committed Mar 20, 2013
Commits on Mar 18, 2013
  1. Revert a fix for #1418. One test breaks

    Joni Freeman committed Mar 18, 2013
  2. Revert a fix for #1418. One test breaks

    Joni Freeman committed Mar 18, 2013
  3. Revert a fix for #1418. One test breaks

    Joni Freeman committed Mar 18, 2013
  4. @jonifreeman

    Merge pull request #1419 from obruchez/master

    Fix #1418 (problem with JSON unflatten when using common prefixes)
    jonifreeman committed Mar 18, 2013
Commits on Mar 15, 2013
  1. Fix #1418 (problem with JSON unflatten when using common prefixes)

    Olivier Bruchez committed Mar 15, 2013
Commits on Mar 11, 2013
  1. Memoization should not ingore type parameters. Fixes #1417.

    Joni Freeman committed Mar 11, 2013
Commits on Mar 6, 2013
  1. @dpp @fmpwizard

    Squashed commit of the following:

    commit aeb44de3bc42f86324a6242b6b8037dd4cb8fbc3
    Author: David Pollak <feeder.of.the.bears@gmail.com>
    Date:   Tue Mar 5 11:48:56 2013 -0800
    
        Squashed commit of the following:
    
        commit 24ff1d946cb1f80630e747a7793ba3f574fe7202
        Author: David Pollak <feeder.of.the.bears@gmail.com>
        Date:   Tue Mar 5 11:47:24 2013 -0800
    
            Removed external bcrypt depedency because the code is already in Lift
    
    commit 09980e8263723f978784666d467e8256118d2446
    Author: David Pollak <feeder.of.the.bears@gmail.com>
    Date:   Tue Mar 5 11:32:01 2013 -0800
    
        MappedPassword now uses bcrypt, but is backward compatible with existing passwords and schemas
    dpp committed with fmpwizard Mar 5, 2013
  2. @pbrant @fmpwizard
  3. @pbrant @fmpwizard

    LocalActionRef should be a RequestVar, not ScreenVar

    The lifetime of a ScreenVar may extend across multiple pages, but the
    contents of this particular ScreenVar is inherently request scoped.
    Local actions may cease working if the screen is restored from an old
    snapshot.
    pbrant committed with fmpwizard Feb 6, 2013
  4. @pbrant @fmpwizard

    Use mutable Map for storing local actions

    If multiple Ajax requests are submitted at once, they'll get independent
    copies of the LocalActions map.  This may result in subsequent errors if
    local actions created by e.g. the first request are used later in
    combination with a snapshot created by a later request.
    pbrant committed with fmpwizard Feb 4, 2013
Commits on Feb 28, 2013
  1. @fmpwizard

    made text friendlier to everyone, not just men

    Thanks @aaronblohowiak for bringing this up
    fmpwizard committed Feb 28, 2013
Commits on Feb 26, 2013
  1. @fmpwizard

    Updated to Lift 2.5-RC1

    Also updated jetty dependency, logback, sbt and web plugin
    fmpwizard committed Feb 25, 2013
Commits on Feb 22, 2013
  1. @Shadowfiend
  2. @Shadowfiend
Commits on Feb 19, 2013
  1. @dpp @fmpwizard
Commits on Feb 15, 2013
  1. @fmpwizard
  2. @Shadowfiend @fmpwizard

    Deprecate S.getHeader in favor of S.getResponseHeader.

    Also deprecate S.getHeaders in favor of S.getResponseHeaders, as well as
    adding an S.setResponseHeader (though S.setHeader is not deprecated as
    it is clear that it refers to the response).
    Shadowfiend committed with fmpwizard Feb 10, 2013
  3. @nafg @fmpwizard
  4. @clessg @fmpwizard

    Fix the field() method in LiftScreen that uses an underlying field so…

    … it incorporates passes in validations as well as the validations on the underlying field.
    clessg committed with fmpwizard Jan 27, 2013
Commits on Jan 31, 2013
  1. @dpp

    Added clearAttrs method to S

    dpp committed Jan 31, 2013
Commits on Jan 24, 2013
  1. @fmpwizard
  2. @fmpwizard

    * Updated sbt to 0.12.1

    fmpwizard committed Jan 23, 2013
  3. @gflanagan @fmpwizard

    Adding ajaxEditableSelect to SHtml. Allows users to dynamically add n…

    …ew selections into an ajaxSelect.
    gflanagan committed with fmpwizard Dec 3, 2012
  4. @ultramiraculous @fmpwizard
  5. @ultramiraculous @fmpwizard

    Updated contributors.md

    ultramiraculous committed with fmpwizard Jan 16, 2013
  6. @ultramiraculous @fmpwizard