Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jun 20, 2014
  1. @Shadowfiend

    Merge branch 'master' into lift_30

    Shadowfiend authored
    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/BindHelpersSpec.scala
    	core/util/src/test/scala/net/liftweb/util/CssSelectorSpec.scala
    	core/util/src/test/scala/net/liftweb/util/TimeHelpersSpec.scala
    	core/util/src/test/scala/net/liftweb/util/VCardParserSpec.scala
    	persistence/mapper/src/main/scala/net/liftweb/mapper/MetaMapper.scala
    	persistence/mongodb/src/main/scala/net/liftweb/mongodb/Mongo.scala
    	persistence/mongodb/src/test/scala/net/liftweb/mongodb/MongoDirectSpec.scala
    	persistence/mongodb/src/test/scala/net/liftweb/mongodb/MongoDocumentExamplesSpec.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/CometActor.scala
    	web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala
    	web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
Commits on Jun 17, 2014
  1. @fmpwizard

    Added squeryl back to the lift build

    fmpwizard authored
    Updated to latest squeryl version
    Minor specs2 change so it compiles undder latest specs2 version
Commits on Jun 7, 2014
  1. @Shadowfiend

    Merge remote-tracking branch 'origin/master' into 1522-forcibly-jsonic

    Shadowfiend authored
    Conflicts:
    	web/webkit/src/test/scala/net/liftweb/http/ReqSpec.scala
  2. @Shadowfiend
Commits on Jun 3, 2014
  1. @Shadowfiend

    Separate target directory for pre-2.11 project.

    Shadowfiend authored
    sbt 0.13.5 barfs if this isn't the case, and it's probably a good idea
    anyway.
Commits on May 11, 2014
  1. @Shadowfiend

    Remove webkit_compat.

    Shadowfiend authored
    We no longer need ConcurrentMap, so webkit_compat can
    be nuked. Booyan.
Commits on May 10, 2014
  1. @Shadowfiend

    Whoops, don't depend on webkit_compat in 2.11-land.

    Shadowfiend authored
    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.
  2. @Shadowfiend

    Add nasty 2.9.2 compatibility hack.

    Shadowfiend authored
    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.
Commits on May 4, 2014
  1. @fmpwizard

    Modified the default root project, lift-framework, to exclude json_sc…

    fmpwizard authored
    …alaz by default.
    
    Added a new project, `lift-framework-with-scalaz6` which adds json_scalaz and can be used
    when you need lift json scalaz that uses scalaz 6
    
    To use it you need to:
    
    1. ++2.10.4
    2. project lift-framework-with-scalaz6
    3. compile //or any task you need, test, publish-local, etc
    
    This means that from now one, if you work as you used to, you will not be comppiling lift-json-scalaz based on scalaz 6, but instead
    you will be using lift-json-scalz7 based on scalaz7
  2. @fmpwizard
  3. @fmpwizard

    Added newer version of scala-jpa

    fmpwizard authored
    Added scala parser cobinator library as dependencies
    Lift-Markdown compiles
Commits on May 3, 2014
  1. @fmpwizard
Commits on Apr 22, 2014
  1. @fmpwizard
Commits on Apr 13, 2014
  1. @Shadowfiend
Commits on Apr 8, 2014
  1. @Shadowfiend
Commits on Aug 24, 2013
  1. @dpp @fmpwizard

    Remove source directive from the scalatest library

    dpp authored fmpwizard committed
Commits on Aug 14, 2013
  1. @dpp
  2. @fmpwizard
Commits on Jun 14, 2013
  1. @dpp @fmpwizard

    Added the Markdown package

    dpp authored fmpwizard committed
Commits on Jun 10, 2013
  1. @dpp

    Added the Markdown package

    dpp authored
Commits on May 13, 2013
  1. @fmpwizard

    Merge branch 'master' into lift_30

    fmpwizard authored
    Conflicts:
    	build.sbt
    	contributors.md
    	liftsh
    	project/Dependencies.scala
    	web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
    	web/webkit/src/main/scala/net/liftweb/http/S.scala
    	web/webkit/src/main/scala/net/liftweb/http/processing/LiftServlet.scala
    	web/webkit/src/main/scala/net/liftweb/sitemap/XmlMenu.scala
Commits on Mar 22, 2013
  1. Adds lift-json-scalaz7 (Scalaz 7 support).

    Taylor Leese authored
    * Adds a new submodule for lift-json-scalaz7.
    * Maintains lift-json-scalaz for Scalaz 6 support.
    * Updated README to correspond to Scalaz 7.
Commits on Mar 5, 2013
  1. @dpp

    Squashed commit of the following:

    dpp authored
    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
Commits on Feb 19, 2013
  1. @dpp

    Removed Scala Actor dependency, added support for Markdown files, aut…

    dpp authored
    …owrap templates in surround if there's no surround
Commits on Feb 12, 2013
  1. @dpp

    First step to a revised 3.0

    dpp authored
Commits on Jan 7, 2013
  1. @nafg

    2.10: Build configuration

    nafg authored
Commits on Dec 19, 2012
  1. @arashi01 @fmpwizard
Commits on Dec 10, 2012
  1. @jeppenejsum
Commits on Aug 27, 2012
  1. @dpp

    WIP for CSS Selectors

    dpp authored
Commits on Jul 30, 2012
  1. @nafg

    Changes to build files

    nafg authored
Commits on Jul 4, 2012
  1. @fmpwizard

    * CouchDB Record was running tests in parallel, and were failing. Now…

    fmpwizard authored
    … they run and pass
    
    * Some mongodb/mongodb-record tests were failing because of the change to S.??
Commits on Jun 19, 2012
  1. @indrajitr
Commits on Jun 13, 2012
  1. @dpp

    Merge pull request #1278 from lift/jnm_jsmin

    dpp authored
    Add YUI processor plugin to minify js resources
  2. @jeppenejsum
Commits on Jun 8, 2012
  1. @eltimn
Something went wrong with that request. Please try again.