Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lift 3.0 merged with master + #1560 #1562

Merged
merged 13 commits into from May 18, 2014
Merged

Commits on Apr 18, 2014

  1. Deprecate xbind-related things in Mapper.

    This includes a bunch of field binding and form snippet
    helpers. New versions are added for doing similar things with
    CssSels instead.
    Shadowfiend committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    e2061fe View commit details
    Browse the repository at this point in the history
  2. Fix a broken interpolation fix.

    I was using string interpolation, but that doesn't work in 2.9.2, so I
    "fixed" it, but I really didn't, but now it's fixed :p
    Shadowfiend committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    51b4f9d View commit details
    Browse the repository at this point in the history

Commits on May 3, 2014

  1. Configuration menu
    Copy the full SHA
    3e1b997 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dd86a6e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    70075dc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6dd9729 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2014

  1. Merge pull request #1556 from lift/tcn_issue_1555

    Move ConnectionIdentifier to util package.
    
    I also replaced the use of MongoIdentifier with ConnectionIdentifier.
    
    Then, I added RecordRules.fieldName that takes a ConnectionIdentifier as an
    argument. I had to add def connectionIdentifier to MetaRecord for this to work.
    Shadowfiend committed May 4, 2014
    Configuration menu
    Copy the full SHA
    06c5b60 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2014

  1. Tweak some TimeHelpers specs for reliability.

    Because of the way specs2 matchers work, calculating the expected time
    in the call-by-name matcher could result in some weirdness. We now
    precompute the expected time.
    Shadowfiend committed May 5, 2014
    Configuration menu
    Copy the full SHA
    27d2fba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9e3bd65 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2014

  1. Merge pull request #1557 from lift/improve-timehelpersspec-reliability

    Tweak some TimeHelpers specs for reliability.
    fmpwizard committed May 6, 2014
    Configuration menu
    Copy the full SHA
    69ade87 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2014

  1. Merge pull request #1546 from lift/deprecate-xbind-stuff

    2.6: Deprecate xbind-related things in Mapper.
    
    This includes a bunch of field binding and form snippet helpers. New versions
    are added for doing similar things with CssSels instead.
    
    They don't map 1-to-1 because CSS selector transforms don't support namespaces,
    amongst other things. Transforms are combined using andThen in case they match
    the same element or match a parent element and something else needs to affect
    the child.
    Shadowfiend committed May 9, 2014
    Configuration menu
    Copy the full SHA
    6646e7a View commit details
    Browse the repository at this point in the history

Commits on May 15, 2014

  1. Merge branch 'master' into lift_30

    Conflicts:
    	persistence/mapper/src/main/scala/net/liftweb/mapper/Mapper.scala
    	persistence/mapper/src/main/scala/net/liftweb/mapper/MetaMapper.scala
    	persistence/mongodb/src/main/scala/net/liftweb/mongodb/Mongo.scala
    	web/webkit/src/main/scala/net/liftweb/http/Wizard.scala
    Shadowfiend committed May 15, 2014
    Configuration menu
    Copy the full SHA
    0547d8b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    72bd272 View commit details
    Browse the repository at this point in the history