Permalink
Switch branches/tags
Commits on Jun 6, 2014
  1. Add some more general details on CSS transforms.

    Shadowfiend committed Jun 6, 2014
    This includes the fact that they’re just
    (NodeSeq)=>NodeSeq.
  2. Ignore generated docs.

    Shadowfiend committed Jun 6, 2014
Commits on Jun 4, 2014
Commits on Jun 3, 2014
Commits on Jun 2, 2014
Commits on May 24, 2014
  1. The c macro now infers AttrModifyingSelector.

    Shadowfiend committed May 24, 2014
    The c macro can now be passed a regular CSS selector
    and, if the parsed selector will modify an attribute, wraps the
    result in an AttrModifyingSelector with the appropriate info.
    
    This will allow binding functions that will be able to take the
    attribute that will be bound as one of their parameters.
  2. Add AttrModifyingSelector to CssSelector.

    Shadowfiend committed May 24, 2014
    This is meant as a marker to indicate that a given selector
    hierarchy will modify an attribute (meaning it terminates in
    an Attr*SubNode). It’s expected to be the root of a selector
    hierarchy.
  3. First pass at a c"" macro for CssSelectors.

    Shadowfiend committed May 24, 2014
    Right now it does a compile-time parse of the selectors and
    emits literal constructors for the selector objects into the
    code.
    
    The next step is to do some additional analysis of the
    resulting selectors and wrap selectors with indications of
    what they’re modifying at their end. That’ll let us be smarter
    about what CanBinds can receive or not from a particular
    selector.
  4. Add webkit-macros project.

    Shadowfiend committed May 24, 2014
    This project will contain 2.11 macros for webkit. Having this
    be a separate project gives us flexibility if breaking macro
    changes occur in 2.12 or whatever, so that we can simply
    point to an appropriately-versioned module instead of
    having to do separate builds of Webkit proper or whatever.
  5. Hack-and-slash getting Lift 3 on 2.11.1.

    Shadowfiend committed May 24, 2014
    This will best be redone after the 2.6 2.11 compatibility stuff goes
    into master.
    
    Merge branch '2.11-tester' into i-heard-you-like-macros
    
    Conflicts:
    	build.sbt
    	core/markdown/src/main/scala/net/liftweb/markdown/BaseParsers.scala
    	core/markdown/src/test/scala/net/liftweb/markdown/LineTokenizerTest.scala
    	core/util/src/test/scala/net/liftweb/util/VCardParserSpec.scala
    	persistence/mapper/src/main/scala/net/liftweb/mapper/MetaMapper.scala
    	persistence/record/src/test/scala/net/liftweb/record/RecordSpec.scala
    	project/Build.scala
    	project/Dependencies.scala
    	web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
Commits on May 23, 2014
  1. Merge pull request #1567 from serveace/lift_30

    Shadowfiend committed May 23, 2014
    ListenerManager.listenerService AddAListener fix
    
    Ensure the correct updateListeners function is called when a listener is added.
Commits on May 22, 2014
  1. ListenerManager.listenerService registration fix

    serveace committed May 22, 2014
    Ensure the correct updateListeners function is called when a listener is added.
Commits on May 20, 2014
  1. Merge pull request #1559 from lift/outline-scripts

    Shadowfiend committed May 20, 2014
    Outline Scripts: Refactor JS support to a single static file + move initialization to per-page file.
    
    Two major things here:
    
     - JS support is now in a single lift.js file at resources/toserve. Initialization is done via the
       LiftRules.javascriptSettings rule.
     - JavaScript added to the page via S.appendJs is now accumulated into a separately
       referenced JS file that is served once.
Commits on May 18, 2014
  1. Merge pull request #1562 from lift/lift_30-with-master-and-1560

    Shadowfiend committed May 18, 2014
    Merge with master + deprecated mongo/ConnectionIdentifier code removal.
Commits on May 15, 2014
  1. Merge branch 'master' into lift_30

    Shadowfiend committed May 15, 2014
    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
Commits on May 13, 2014
  1. javaScriptSettings returns Box[LiftSession=>JsObj]

    Shadowfiend committed May 13, 2014
    We remove autoIncludeJSSettings in favor of an Empty Box
    returned from javaScriptSettings; we also fix the
    capitalization of javaScriptSettings (it was
    javascriptSettings).
  2. Add and use lift.onDocumentReady function.

    Shadowfiend committed May 13, 2014
    jQuery’s just assigns to $(document).ready, while the vanilla
    one uses Diego Perini’s contentloaded script to set things
    up.
Commits on May 12, 2014
  1. Merge pull request #1534 from lift/deprecator-exterminator

    Shadowfiend committed May 12, 2014
    Deprecator Exterminator: Systematic de-warningification of Lift 3
    
    This PR should get rid of all compiler warnings in Lift 3, as well as internal
    deprecations from the 2.x series.
Commits on May 11, 2014
  1. Remove webkit_compat.

    Shadowfiend committed May 11, 2014
    We no longer need ConcurrentMap, so webkit_compat can
    be nuked. Booyan.
  2. Move snippetClassMap to ConcurrentHashMap.

    Shadowfiend committed May 11, 2014
    This in LiftSession, where we were still using a
    ConcurrentMap wrapper around ConcurrentHashMap. This
    wrapper is now gone, we no longer need ConcurrentMap,
    and we can remove some of the hacks needed to support
    the name changes it underwent.
Commits on May 10, 2014
  1. Merge remote-tracking branch 'origin/master' into antonio_scala_2_11

    Shadowfiend committed May 10, 2014
    Conflicts:
    	core/util/src/test/scala/net/liftweb/util/TimeHelpersSpec.scala
  2. Add compatible around declaration for specs2 2.x.

    Shadowfiend committed May 10, 2014
    specs2 1.x uses around[T <% Result], specs2 2.x uses
    around[T: AsResult] with an AsResult invocation around the
    block result.
  3. Whoops, don't depend on webkit_compat in 2.11-land.

    Shadowfiend committed May 10, 2014
    This was happening because we were calling dependOn on
    the webkit project, which apparently modifies it rather than
    returning a version with the new dependency. We now make
    webkit_pre_211 a full-fledged project of its own.
  4. Add nasty 2.9.2 compatibility hack.

    Shadowfiend committed May 10, 2014
    Scala 2.10 introduced the collection.concurrent.Map
    package and class that supersedes ConcurrentMap, and
    then 2.11 removed ConcurrentMap altogether.
    
    2.10 also introduced JavaConversions for the new type, and
    2.11 removed the old ones. To properly compile in 2.9, we
    need a thin layer that provides the new APIs in 2.9 and
    transparently calls the old stuff.
    
    Also mucks about thoroughly with the project setup so that
    we have a pre-2.11 project that does all the nasty 2.9 slicing
    and dicing and a regular project that does everything
    2.11-style.
  5. Extend FlatSpec instead of mixing it in.

    Shadowfiend committed May 10, 2014
    We do this in a way that will work across both 2.9.x and
    2.11 versions of scalatest, which means we have to treat
    FlatSpec as a class. Mixing in FlatSpecLike isn’t an option
    because the trait doesn’t exist on the 2.9.x version of
    scalatest.
    
    To do this properly, we have to instantiate a LineTokenizer
    directly in the class rather than being able to extend it in our
    test class, since you can’t extend two classes.