Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Fashionbase/framework
...
head fork: lift/framework
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Jan 23, 2014
@dmclean62 dmclean62 Added my name and email b0f4b95
@dmclean62 dmclean62 Corrected formatting 12000b2
Commits on Jan 31, 2014
websterc Memoize declared fields to avoid reflection during case class decompo…
…sition
2ad7379
Commits on Feb 07, 2014
@dmclean62 dmclean62 Update MockHttpServletRequest.scala 4b49438
@dmclean62 dmclean62 Update MockHttpRequestSpec.scala a4510e6
Commits on Feb 11, 2014
@Shadowfiend Shadowfiend Merge pull request #1506 from japgolly/liftrule_for_funcname_gen
Added LiftRules.funcNameGenerator which controls the logic of S.formFuncName

Introduce a funcNameGenerator volatile var in LiftRules that points to a function that
generates a function name when called. Defaults to S.generateTestFuncName in
test mode, S.generateFuncName otherwise, and these have the same implementations
as the previous implementations for test and other modes.
17513a2
Commits on Feb 15, 2014
@farmdawgnation farmdawgnation Merge pull request #1517 from chriswebster/master
Memoize declared fields to avoid reflection during case class decomposition.
1da8516
@farmdawgnation farmdawgnation Clarify some of the Memo names used in Meta.Reflection.
I noticed when we merged a PR that the names of the various Memos in
Meta.Reflection were getting a bit confusing, so I've cleaned them up a
bit to 1) reduce confusion between what are now called
hasDeclaredFieldsMemo and declaredFieldsMemo and 2) to clarify what the
primaryConstructorArgumentsMemo actually contained.
bf56a65
Commits on Mar 15, 2014
@Shadowfiend Shadowfiend Rename pageResourceId to instanceResourceId in LiftRules.
Also drop a comment on it indicating what it’s for, and move it
closer to its usage spot.
3b1e705
@Shadowfiend Shadowfiend Add instance- prefix to instance resource id.
This makes it clearer what it is when looking at the output of
lift:with-reosurce-id (before it looked like a function binding),
and also ensures that we won’t warn you about an unbound
function name when using with-resource-id.
651a178
Commits on Mar 16, 2014
@Shadowfiend Shadowfiend Fix expectation for blank parameter URI serialization.
Also clarify variable names.
e564f5e
@Shadowfiend Shadowfiend Remove expected IllegalArgumentException for blank parameter in spec. 954ab42
@Shadowfiend Shadowfiend Merge branch 'issue-1516'
Fix for problem in mock requests where a parameter in the URL has a blank value
(either "a=" or just "a").
07391f0
@Shadowfiend Shadowfiend Merge branch 'master' into vn971-master
Conflicts:
	contributors.md
08dfc68
Commits on Mar 17, 2014
@farmdawgnation farmdawgnation Merge remote-tracking branch 'origin/master' into msf_issue_1519 fc30aef
@farmdawgnation farmdawgnation Remove unused hasDeclaredField and its memo. 0d99445
Commits on Mar 30, 2014
@Shadowfiend Shadowfiend Merge pull request #1519 from lift/msf_issue_1519
Do some variable name cleanup in lift-json.

We had a memo named declaredFields and another named declaredFieldsMap,
that was added recently to prevent us from having to reflect on each retrieval of
the declared fields. These names were a bit confusing, so we changed them up.
78546a0
Commits on Apr 03, 2014
Robert Freytag Fixed stale database connection release
 - getAutoCommit, rollback and commit can throw exceptions
   on stale connections, which was preventing
   a correct connection release
2e830f1
Commits on Apr 04, 2014
@farmdawgnation farmdawgnation Implement toSingleBox.
The toSingleBox method takes a List[Box[T]] and turns it into a
Box[List[T]], via an implicit conversion to ListOfBoxes.
5b8b7b7
Commits on Apr 06, 2014
@Shadowfiend Shadowfiend Fix Box->Option implicit conversion spec.
We were testing Empty to ensure isDefined returned false, but
isDefined hasn’t triggered an implicit conversion to Option in a
while. We now test the implicit conversion by verifying that
orElse exists and behaves as expected on Options.
b89d124
@Shadowfiend Shadowfiend Fix a reference to open_! in the Box specs. 38866be
@Shadowfiend Shadowfiend Define a get method on Box and immediately deprecate it.
We do this so that get no longer triggers an implicit conversion
to Option, and triggers a deprecation warning. In the future,
get will remain defined but will throw an exception and be
defined as returning an internal vestigial type to break
compilation.

Those who still want to use .get can call .toOption.get.
0bdee65
Commits on Apr 07, 2014
@farmdawgnation farmdawgnation Merge pull request #1523 from lift/1523-gettin-boxed-in
Define a Box.get that is deprecated to discourage people from using it since it's not the "correct" way to open a box.
68363a0
@farmdawgnation farmdawgnation Merge pull request #1521 from lift/asc-issue-1521
Fix the unexpected WARN while using `with-resource-id` by making instance IDs their own thing.
0b4c96f
@Shadowfiend Shadowfiend Merge branch 'master' into lift_30 748f23d
@Shadowfiend Shadowfiend Intentionally cripple Box's .get method for Lift 3.
Box.get now returns Nothing, which should break anyone
attempting to use its return type for anything, including tests.

Also fix a Box test that relied on .get.
50d23b4
@Shadowfiend Shadowfiend Drop open_! and openTheBox, which are deprecated. e4aa142
Robert Freytag narrowed catch clause in connection-release,
 changed loglevel to error
e375dae
Commits on Apr 08, 2014
@farmdawgnation farmdawgnation Merge pull request #1526 from rofreytag/db_realeasecon_fix
The methods getAutoCommit, rollback and commit can throw exceptions on stale connections. This PR implements corrected error handling during the connection releasing process so bad connections don't just hang around.
3387cdd
@Shadowfiend Shadowfiend Fix several lift-util tests that used Box.get. 2f4abf2
@farmdawgnation farmdawgnation Merge pull request #1530 from lift/lift-3-box-get-out
Disables Box.get in Lift 3. It also removes open_! and openTheBox, which were deprecated in Lift 2.4.
b19f8a4
@farmdawgnation farmdawgnation Simplify the toSingleBox implementation. 2b93d76
@farmdawgnation farmdawgnation Update toSingleBox doc to state that List sizes may differ. 1d2cf14
@Shadowfiend Shadowfiend Merge pull request #1525 from lift/msf_issue_1525
Implement a helper for Iterator[Box[T]] => Box[List[T]]
6ca7a38
Commits on Apr 10, 2014
@Shadowfiend Shadowfiend Merge branch 'master' into lift_30 22ee99b
@Shadowfiend Shadowfiend Rework ListOfBoxes and implicit to implicit class extending AnyVal.
This avoids an allocation and avoids the implicit conversion method.
f39016e
Commits on Apr 11, 2014
@Shadowfiend Shadowfiend Fix manifest and pure value warnings in common. 1b90b0b
@Shadowfiend Shadowfiend Add feature imports as needed in common. 80c15bb
@Shadowfiend Shadowfiend Fix lift-markdown feature warnings. 153d894
@Shadowfiend Shadowfiend Fix lift-json XML Elem constructor warnings. 16c400b
@Shadowfiend Shadowfiend Fix existential type warning in ScalaSig.
We still had code in place to support 2.8 that is no longer
needed, so we stop using existential types.
4688414
@Shadowfiend Shadowfiend Fix a postfix operator warning in lift-json. e98bd82
@Shadowfiend Shadowfiend Fix inferred existential type warnings in lift-json.
There were a few places where the compiler was inferring
existential types when we needed to just be explicit about our
wildcard types.
35d7fad
@Shadowfiend Shadowfiend Fix an erasure deprecation warning in lift-json. a1c63d6
@Shadowfiend Shadowfiend Add a catch-all to JsonAST's Document match.
Document isn’t a sealed abstract class, so we need a wildcard
match at the end or we get a match exhaustiveness warning.
ef9e6d1
@Shadowfiend Shadowfiend Feature imports to appease warnings in lift-json.
One in particular is due to a Scala compiler bug, but it’s been
annotated accordingly.
c56d7b3
@Shadowfiend Shadowfiend Fix an inferred existential type in lift-json.
Compiler quirkiness…
26c6e59
@Shadowfiend Shadowfiend Implicit conversion->implicit class in lift-json. d93a95e
@Shadowfiend Shadowfiend Change fixme to explanation in Box.asA.
There was a FIXME about why existential types were being
used for Box.asA, but I figured it out, so I filled in the
reasoning as a comment.
e8e6a45
Commits on Apr 12, 2014
@farmdawgnation farmdawgnation Version bump to 2.6-M3 for release. 0c141a8
@farmdawgnation farmdawgnation Version bump to 2.6-SNAPSHOT for forward development. 65aeefb
@Shadowfiend Shadowfiend Fix a catchall exception handler warning in actor. 18aa419
@Shadowfiend Shadowfiend Fix an implicit conversion feature warning.
Not sure what JsonCommand is for to begin with, but that’s
a separate question.
ab126e2
@Shadowfiend Shadowfiend Import implicitConversions as needed in util. cf1108e
@Shadowfiend Shadowfiend Fix minimizeEmpty deprecations in util.
Elem has an extra required parameter in its constructor.
a9c16b6
@Shadowfiend Shadowfiend Import postfixOps as needed in lift-util. 351a28d
@Shadowfiend Shadowfiend Implicit conversions->implicit classes in util. 5b057f5
@Shadowfiend Shadowfiend Drop some deprecated implicits to nuke warnings in util. 6c06dc1
@Shadowfiend Shadowfiend Import higherKinds as needed in util. b67e05c
@Shadowfiend Shadowfiend Import reflectiveCalls as needed in util. 5fa32ba
@Shadowfiend Shadowfiend Fix catch-all exception warnings in util. 3ea2566
@Shadowfiend Shadowfiend Fix reference to Manifest.erasure in util. 560424d
@Shadowfiend Shadowfiend Fix inferred existential type in util.
We are now explicit about the wildcard type.
089bd66
@Shadowfiend Shadowfiend Fix val in for comprehension in util. 0bce74a
@Shadowfiend Shadowfiend Fix pure expression warning in CssSel. babbc11
@farmdawgnation farmdawgnation Merge pull request #1532 from lift/1531-not-just-any-val
Rework ListOfBoxes and implicit to implicit class extending AnyVal, which we're doing only for Lift 3 as it requires Scala 2.10.
a806531
@farmdawgnation farmdawgnation Build the 2.10 edition of Lift 2.x using Scala 2.10.4 e699276
@farmdawgnation farmdawgnation Merge remote-tracking branch 'origin/master' into lift_30 ad87bf8
@Shadowfiend Shadowfiend Fix some val-in-for warning in testkit. f3bc6e4
@Shadowfiend Shadowfiend Fix wildcard throwable matches in testkit. fb6e9ee
@Shadowfiend Shadowfiend Import implicitConversions as needed in testkit. 239eced
@Shadowfiend Shadowfiend Lose a bunch of postfix operators in lift-webkit. 54a51b8
@Shadowfiend Shadowfiend Fix deprecated Elem constructor warnings in webkit.
In some cases we use .copy, others we just manually copy
over minimizeEmpty; we’ll probably want to switch to .copy
everywhere viable at some point.
2e2bb5b
@Shadowfiend Shadowfiend Import existentials as needed in webkit.
Mostly annoying places they shouldn’t be necessary, but
such is life.
0afb59a
@Shadowfiend Shadowfiend Fix webkit Enumerations using deprecated constructor.
We explicitly list out the Value calls now.
b9ad73a
@Shadowfiend Shadowfiend Drop an unnecessary structural type cast in webkit.
We keep the structural type, because e.g. FoBo is making use
of it, but we don’t need to use it here, and not using it evades
a reflective call warning (and thusly a reflective call).
d6142d5
@Shadowfiend Shadowfiend Fix type erasure warnings in webkit. 1388464
@Shadowfiend Shadowfiend Fix a concurrent map conversions in webkit.
ConcurrentMap is now deprecated in favor of concurrent.Map,
and the corresponding Java conversion function has also been
renamed.
7bf2b22
@Shadowfiend Shadowfiend Explicit BooleanThreadGlobal class in LiftSession.
We were using an anonymous subclass, which was apparently
being picked up as a structural type and whose ? method was
being invoked via reflection. No good.
633dcef
@Shadowfiend Shadowfiend Fix source match for Java array.
Before it was listed after java.lang.Iterable, but Rhino’s
NativeArray implements List, which implements Iterable,
which means we were never hitting that condition.
deb2766
@Shadowfiend Shadowfiend Import reflectiveCalls as needed in webkit. fcc184b
Commits on Apr 13, 2014
@Shadowfiend Shadowfiend Fix some wildcard exception match warnings in db. 00ba218
@Shadowfiend Shadowfiend Fix some type erasure warnings in proto. 1e89906
@Shadowfiend Shadowfiend Manifest->Tag and erasure->runtimeClass in mapper. 1bfc76c
@Shadowfiend Shadowfiend Fix some postfix operator warnings in mapper. cb3150b
@Shadowfiend Shadowfiend Fix type erasure warnings in mapper. e322783
@Shadowfiend Shadowfiend Fix a val-in-for warning in mapper. 920af52
@Shadowfiend Shadowfiend Import existentials as needed in mapper. 965c04e
@Shadowfiend Shadowfiend Fix wildcard exception match warnings in mapper. 241dbfa
@Shadowfiend Shadowfiend Fix type erasure warnings in record. 4701691
@Shadowfiend Shadowfiend Fix postfix operator warnings in record. 2567542
@Shadowfiend Shadowfiend Fix pure expression warning in record. 26207e3
@Shadowfiend Shadowfiend Fix deprecated elem apply warning in record. 75b6560
@Shadowfiend Shadowfiend Import existentials as needed in record. ebb674d
Commits on Apr 15, 2014
@Shadowfiend Shadowfiend Switch lift-mongo to use MongoClient(Options).
This might not be as straightforward as other deprecation
warnings; feedback needed.
e59769a
@Shadowfiend Shadowfiend Fix type erasure warnings in lift-mongodb-record. bd3f3c8
@Shadowfiend Shadowfiend erasure->runtimeClass in lift-mongodb-record. ca3136d
@Shadowfiend Shadowfiend Fix postfix operator warnings in lift-mongodb-record. d43507a
@Shadowfiend Shadowfiend Fix postfix operator warnings in lift-squeryl-record. c04cf38
@Shadowfiend Shadowfiend erasure->runtimeClass in lift-squeryl-record. c88d8bd
Commits on Apr 16, 2014
@Shadowfiend Shadowfiend ClassManifest->ClassTag in lift-json-ext. b81bcd5
@Shadowfiend Shadowfiend erasure->runtimeClass in lift-json-ext. f836305
@Shadowfiend Shadowfiend Import existentials as needed in lift-json-scalaz. 6d3a8a6
@Shadowfiend Shadowfiend Import existentials as needed in lift-json-scalaz7. d74b40d
@Shadowfiend Shadowfiend Fix type erasure warnings in lift-json tests. bfa7f35
@Shadowfiend Shadowfiend Fix postfix op warning in lift-util tests. 8a28f61
@Shadowfiend Shadowfiend Fix reflective access warning in lift-util tests. dbaaf06
@Shadowfiend Shadowfiend Fix exhaustive match warning in lift-util tests. 9b370d1
@Shadowfiend Shadowfiend Fix deprecation warnings in lift-util tests. 1e7b145
@Shadowfiend Shadowfiend Fix reflective access warnings in lift-webkit tests. 8c7bbc6
@Shadowfiend Shadowfiend erasure->runtimeClass in lift-webkit tests. b8c5bbe
@Shadowfiend Shadowfiend Fix wildcard exception matchers in lift-mapper tests. 1fcb0c2
@Shadowfiend Shadowfiend Fix ne comparison warnings in lift-mapper tests.
In MapperSpec, because the providers list was inferred to
have type List[DbProviders.H2MemoryProvider], comparisons
to avoid testing certain things against MySql and other
providers were causing warnings.

We fix this by being explicit about the type of the providers list.
This is important because the spec is structured so that you
can just add other providers if you have them set up properly
and test mapper as needed against those providers.
783e67a
@Shadowfiend Shadowfiend Import reflectiveCalls as needed in lift-json-scalaz tests. 930f5b2
@Shadowfiend Shadowfiend Import reflectiveCalls as needed in lift-json-scalaz7 tests. 9bcda88
@Shadowfiend Shadowfiend Fix exhaustive match warning in lift-markdown tests. 97c08c7
Commits on Apr 17, 2014
@farmdawgnation farmdawgnation Merge pull request #1535 from lift/utilitarian-actors
Utilitarian Actors: Fix src warnings in lift-actor and lift-util
7691cd0
@farmdawgnation farmdawgnation Merge remote-tracking branch 'origin/deprecator-exterminator' into em…
…ergency-kits
df58d9a
@farmdawgnation farmdawgnation Merge pull request #1538 from lift/emergency-kits
Emergency Kits: Fix src warnings in lift-testkit and lift-webkit
3270f24
@farmdawgnation farmdawgnation Merge remote-tracking branch 'origin/deprecator-exterminator' into db…
…licious
ed15dbf
@farmdawgnation farmdawgnation Merge pull request #1539 from lift/dblicious
Dblicious: Fix src warnings in lift-proto, lift-db, lift-mapper, and lift-record
fa74941
@farmdawgnation farmdawgnation Merge branch 'deprecator-exterminator' into json-and-the-argonauts d76c250
@farmdawgnation farmdawgnation Merge pull request #1541 from lift/json-and-the-argonauts
JSON and the Argonauts: Fix src warnings in lift-json-ext, lift-json-scalaz, and lift-json-scalaz7
be3fa46
@farmdawgnation farmdawgnation Merge branch 'deprecator-exterminator' into testing-one-two-three b19f20f
@Shadowfiend Shadowfiend Fix the deprecation warning in jsonCall.
It was referring to JValue=>JValue methods, but should have been referring to
JValue=>JsCmd ones.
69eab3f
@Shadowfiend Shadowfiend Deprecate S.fjsonCall, which does not use lift-json. b855d34
@Shadowfiend Shadowfiend Deprecate a bunch of stuff that uses the old JSONParser. 2a08c23
@Shadowfiend Shadowfiend Deprecate jsonFmapFunc with old JSONParser.
Also add non-deprecated equivalents that do JValue=>JsCmd.
c2e9260
@Shadowfiend Shadowfiend Deprecate legacy JSONParser things in MetaRecord. 0df21dd
Commits on Apr 18, 2014
@farmdawgnation farmdawgnation Merge pull request #1542 from lift/testing-one-two-three
Testing 1-2-3: Fix test warnings in all but lift-mongodb and lift-mongodb-record
a7acb7c
@Shadowfiend Shadowfiend Switch Mongo specs to use MogoClient(Options). a1d4353
@Shadowfiend Shadowfiend Fix wildcard exception warning in MongoTestKit. 4ecd319
@Shadowfiend Shadowfiend Remove deprecated comet functions/functionality. 3d10b83
@Shadowfiend Shadowfiend Drop deprecated Box apply. a500cef
@Shadowfiend Shadowfiend Drop a bunch of deprecated stuff.
These are deprecated things that have no interdependencies
in the code, so removing them within the Lift codebase is
clean.
78c1ecf
@Shadowfiend Shadowfiend Drop deprecated S.??. a2cef18
@Shadowfiend Shadowfiend Drop deprecated LiftRules.docType. 47913a4
@Shadowfiend Shadowfiend Drop deprecated LiftRules.noCometSessionPage. 12dec62
@Shadowfiend Shadowfiend Drop deprecated JQuery1(3|4)Artifacts. 9f378e4
@Shadowfiend Shadowfiend Drop deprecated LiftRules.servletAsyncProvider. ab30ba9
@Shadowfiend Shadowfiend Drop deprecated LiftRules.*supplimental* header variants. 1838d8b
@Shadowfiend Shadowfiend Rip out most JSONParser-related stuff in S/SHtml.
Still pending is a setFieldFromJSON in MetaRecord.
8d82f1d
@Shadowfiend Shadowfiend Rip out JSONParser stuff in Record. 1f41c49
@Shadowfiend Shadowfiend Rip out JSONParser. 2630b48
@Shadowfiend Shadowfiend Drop some deprecated stuff that was missed.
These were marked in scaladoc as deprecated; we'll backport a proper
deprecation warning to 2.6.
d9e5983
@Shadowfiend Shadowfiend Add proper deprecation warnings to two methods.
These were deprecated in the scaladoc but not annotated as such, so did not
emit warnings.
d009f02
@eltimn eltimn Fixed mongo tests. 2870fc6
@farmdawgnation farmdawgnation Change default scala version to 2.10.4.
The 2.10 compiler is so much quicker that it makes sense for that to be
the default version we're using.
08ae7e1
@farmdawgnation farmdawgnation Merge remote-tracking branch 'origin/deprecator-exterminator' into vh…
…s-recorder
4fed83f
@farmdawgnation farmdawgnation Merge pull request #1540 from lift/vhs-recorder
VHS recorder: Fix src warnings in lift-mongodb, lift-mongodb-record, and lift-squeryl-record
00a834b
@farmdawgnation farmdawgnation Merge remote-tracking branch 'origin/deprecator-exterminator' into go…
…od-bye-deprecateds

Conflicts:
	persistence/mongodb/src/main/scala/net/liftweb/mongodb/Mongo.scala
f987ad4
@farmdawgnation farmdawgnation Merge pull request #1544 from lift/good-bye-deprecateds
Good-bye deprecateds (except xbind)
a0f83b5
@farmdawgnation farmdawgnation Merge pull request #1545 from lift/scaladoc-deprecations
2.6: Add proper deprecation warnings to two methods.
9fef65c
@Shadowfiend Shadowfiend 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.
e2061fe
@Shadowfiend Shadowfiend 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
51b4f9d
@Shadowfiend Shadowfiend Replace mapper fieldPF stuff with CSS transforms.
The fieldPF things are separately deprecated in Lift 2.6.
Meantime, fieldMapperPF is replaced by
fieldMapperTransforms, addSnippet/editSnippet/viewSnippet
by addFormSnippet/editFormSnippet/viewTransform, fieldPF
by fieldTransforms, appendField/prependField by
appendFieldTransform/prependFieldTransform.
139981e
@Shadowfiend Shadowfiend Rip out BindHelpers.xbind, which was deprecated. 91ec770
@Shadowfiend Shadowfiend Clear a postfix operator warning in lift-json. 0e6548d
@Shadowfiend Shadowfiend Fix up some unnecessary casts in BCrypt.
javac was throwin’ some warnings about them.
328ed6d
@Shadowfiend Shadowfiend Suppress an unwarranted warning in A.java.
The SaveVarags annotation didn’t seem to work for some
reason?
811f909
Commits on Apr 22, 2014
@fmpwizard fmpwizard Initial changes to dependencies to build lift against 2.11.0 final 1a61b14
Commits on Apr 23, 2014
@eltimn eltimn Made liftAjax.js and liftComet.js a single static .js file. 4b51be1
@eltimn eltimn Fixed hard-coded LiftRules.resourceServerPath 1221e65
@Shadowfiend Shadowfiend Send basic JS info in data- attributes.
This includes the page version, session id, and comet ids and
versions. The data- attributes are set and read on the body
element of the page.
89450a4
Commits on Apr 26, 2014
@eltimn eltimn Issue 1498 - Mongo -> MongoClient Transition
Deprecated MongoAddress, MongoHostBase, MongoHost, MongoSet, and the MongoDB functions that take them as an argument.

Deprecated the MongoDB functions that take Mongo as an argument and added ones that take MongoClient as an argument.

Deprecated MongoRecord.save (no arguments).

Added default argument of `true` to MongoRecord.save(safe: Boolean) function.

Added MongoRecord.save(inst: BaseRecord) function that uses the WriteConcern configured in Mongo/MongoClient.

Added saveBox(), updateBox(), and deleteBox_! functions to MongoRecord that all wrap the related functions in tryo and return a Box.

Internally, MongoDB still uses Mongo, so no behavior will change unless MongoClient (or MongoOptions with a different WriteConcern) is used.
2a9a935
@Shadowfiend Shadowfiend Remove enableGc from LiftJavaScript config.
We now decide whether or not GC is enabled by the presence
of a data-lift-gc attribute.
ee1d3c0
@Shadowfiend Shadowfiend Redo body attribute calculation. fb51a98
@Shadowfiend Shadowfiend Move page-specific JS into a RequestVar.
The RequestVar contains a JavaScriptResponse, though it
isn’t yet hooked up. Looking up /lift/<page id>.js will return the
file in that RequestVar, if present.
c9393d5
Commits on Apr 27, 2014
@eltimn eltimn Fixed MongoSave tests. 86d6f1c
@eltimn eltimn Use beLike to check failure message. d6a9581
Commits on Apr 28, 2014
@Shadowfiend Shadowfiend Revert "Change default scala version to 2.10.4."
This reverts commit 08ae7e1.

We decided that it was worth the pain of "accidentally" running into 2.9
errors when coding with 2.10 in mind, especially considering the
forthcoming work that will happen in 2.10 land on Lift 3. See
lift#1536 for more.
43fa63d
@Shadowfiend Shadowfiend Merge pull request #1536 from lift/power-of-fours
Build the 2.10 edition of Lift 2.x using Scala 2.10.4
df0f6c2
@Shadowfiend Shadowfiend Merge pull request #1543 from lift/more-deprecations
2.6: Deprecate old JSONParser-related stuff

Lift still has a legacy JSON parser that we want to rip out for Lift 3. This deprecates
a slew of functionality in S, SHtml, and CometActor that uses that legacy JSON
parser.
dae2255
Commits on Apr 29, 2014
@Shadowfiend Shadowfiend Replace ajaxPath/cometPath with liftPath.
liftPath is now the root of Lift requests, and everything under
it is under our control. AJAX lives at $liftPath/ajax and comet
at $liftPath/comet. Additionally, we drop ajax and comet from
the JSArtifacts. These functions are now provided directly by
lift.js.
9bf4370
@Shadowfiend Shadowfiend Drop ScriptRenderer, which is no longer used. aef724e
@Shadowfiend Shadowfiend Move LiftMerge#scriptUrl to liftPath. 49d3e4d
@Shadowfiend Shadowfiend Namespace page script under $liftPath/page/* f342fbb
@Shadowfiend Shadowfiend Fix compile error with page inclusion check. 18dc416
@Shadowfiend Shadowfiend Fix construction of body attributes.
We had switched to half-String half-Option[String], breaking
compilation; it’s all String now.
d633931
@eltimn eltimn Added Promise code to lift.js 7c72e4d
Commits on Apr 30, 2014
@Shadowfiend Shadowfiend Add dispatch for per-page JS. a028786
@Shadowfiend Shadowfiend Uppercase GUID in comet data attributes. e18145c
@Shadowfiend Shadowfiend Fix initial comet registering in lift.js 940fd6d
Commits on May 02, 2014
@farmdawgnation farmdawgnation Merge pull request #1547 from lift/x-nay-to-the-ind-bay
X-nay to the ind-bay: Remove BindHelpers.xbind, plus a couple of extra warnings
e24e206
@Shadowfiend Shadowfiend Merge pull request #1552 from lift/tcn_issue_1498_2
Issue #1498 - Mongo -> MongoClient Transition

Deprecates old constructors that interact with Mongo and Lift's abstractions
over it and adds versions that deal with MongoClient.

Also deals with WriteConcern differences in MongoClient vs Mongo, and adds
a couple of new convenience methods to MongoRecord.
5a8f5cf
@Shadowfiend Shadowfiend Merge branch 'master' into lift_30
Conflicts:
	build.sbt
	project/Dependencies.scala
4bbea48
Commits on May 03, 2014
@eltimn eltimn Removed deprecated code from lift-mongodb and lift-mongodb-record b629ef3
@eltimn eltimn Move ConnectionIdentifier to util package. 3e1b997
@eltimn eltimn Replaced use of MongoIdentifier with ConnectionIdentifier dd86a6e
@eltimn eltimn Updated mapper.ConnectionIdentifier to util.ConnectionIdentifier 70075dc
@eltimn eltimn Issue #1505 - Create RecordRule for field name. 6dd9729
@fmpwizard fmpwizard Added scala-xml a dependency starting with scala 2.11.0 87014c3
Commits on May 04, 2014
@fmpwizard fmpwizard Added newer version of scala-jpa
Added scala parser cobinator library as dependencies
Lift-Markdown compiles
dc12a07
@fmpwizard fmpwizard Added a Position.scala file which was made private in scala 2.11.0
but they do not offer any replacement and we need it.
Added 2.11.0 as a version we cross compile
7e79e68
@fmpwizard fmpwizard Use latest version of combinators library fdc7303
@fmpwizard fmpwizard Modified the default root project, lift-framework, to exclude json_sc…
…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
c720deb
@Shadowfiend Shadowfiend Fixed a compilation issue in MongoRecordSpec.
There was a call to .save without parens, which gave the compiler some
trouble in resolving the overload.
1077452
@fmpwizard fmpwizard scalaz7 uses 2.11 prefix, not 2.11.0 a5ae545
@fmpwizard fmpwizard Merge remote-tracking branch 'origin/master' into diego_scala_2_11
Conflicts:
	build.sbt
	project/Dependencies.scala
7026e86
@Shadowfiend Shadowfiend 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.
06c5b60
Commits on May 05, 2014
@Shadowfiend Shadowfiend 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.
27d2fba
@Shadowfiend Shadowfiend Increase the error margin of .later spec. 9e3bd65
Commits on May 06, 2014
@fmpwizard fmpwizard Merge pull request #1557 from lift/improve-timehelpersspec-reliability
Tweak some TimeHelpers specs for reliability.
69ade87
@Shadowfiend Shadowfiend Merge pull request #1554 from lift/tcn_issue_1498_30
Removed deprecated code from lift-mongodb and lift-mongodb-record

This removes the deprecated code from #1498
cc0ddca
@Shadowfiend Shadowfiend Merge remote-tracking branch 'origin/lift_30' into deprecator-extermi…
…nator

Conflicts:
	core/util/src/main/scala/net/liftweb/util/TimeHelpers.scala
	persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/MongoRecord.scala
	persistence/mongodb-record/src/test/scala/net/liftweb/mongodb/record/MongoTestKit.scala
	persistence/mongodb/src/main/scala/net/liftweb/mongodb/Mongo.scala
	persistence/mongodb/src/test/scala/net/liftweb/mongodb/MongoSpec.scala
	persistence/record/src/main/scala/net/liftweb/record/MetaRecord.scala
	project/Dependencies.scala
	web/webkit/src/main/scala/net/liftweb/http/CometActor.scala
	web/webkit/src/main/scala/net/liftweb/http/S.scala
	web/webkit/src/main/scala/net/liftweb/http/SHtml.scala
9ddbd32
@Shadowfiend Shadowfiend Fix ResourceServerSpec for jquery changes.
We no longer force jquery.js to point to jquery-1.3.2.min.js.
92bb99d
@Shadowfiend Shadowfiend Fix WizardSpecs.
When fixing them to avoid existentials, we switched some vals to defs,
resulting in multiple Screen instances being created, which changed the
screen naming and made the specs fail as a result.
8ee2e7b
Commits on May 09, 2014
@Shadowfiend Shadowfiend 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.
6646e7a
Commits on May 10, 2014
@Shadowfiend Shadowfiend Fix a concurrent map conversions in webkit.
ConcurrentMap is now deprecated in favor of concurrent.Map,
and the corresponding Java conversion function has also been
renamed.
a595578
@Shadowfiend Shadowfiend Fix webkit Enumerations using deprecated constructor.
We explicitly list out the Value calls now.
54353c6
@Shadowfiend Shadowfiend Mix in XmlMatchers as needed in specs2.
Specs2 2.x does not mix XmlMatchers into Specification by
default.
1e214e8
@Shadowfiend Shadowfiend Fix visibility issue in S for 2.11.
The private modifier no longer allows access through the
singleton, even from the same instance.
dbfc54c
@Shadowfiend Shadowfiend Fix specs2 return type inferencing issues.
specs2 2.x doesn’t seem to handle Unit return types of its
specs automatically, so we have to make sure the last
statement in a spec is always a matcher.
2d56793
@Shadowfiend Shadowfiend Fix 2.11 issue with type alias variance. 43eb545
@Shadowfiend Shadowfiend Increase margin for later/ago TimeHelpers specs. 8a6224e
@Shadowfiend Shadowfiend Extend FlatSpec instead of mixing it in.
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.
09822b3
@Shadowfiend Shadowfiend Add nasty 2.9.2 compatibility hack.
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.
312c6f1
@Shadowfiend Shadowfiend Whoops, don't depend on webkit_compat in 2.11-land.
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.
0e7bbbe
@Shadowfiend Shadowfiend Add compatible around declaration for specs2 2.x.
specs2 1.x uses around[T <% Result], specs2 2.x uses
around[T: AsResult] with an AsResult invocation around the
block result.
33333e5
@Shadowfiend Shadowfiend Merge remote-tracking branch 'origin/master' into antonio_scala_2_11
Conflicts:
	core/util/src/test/scala/net/liftweb/util/TimeHelpersSpec.scala
a309679
Commits on May 11, 2014
@Shadowfiend Shadowfiend Move snippetClassMap to ConcurrentHashMap.
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.
23d5403
@Shadowfiend Shadowfiend Remove webkit_compat.
We no longer need ConcurrentMap, so webkit_compat can
be nuked. Booyan.
887f20d
@Shadowfiend Shadowfiend Remove extraneous scalaParserVersion variable. d0106b3
Commits on May 12, 2014
@Shadowfiend Shadowfiend Merge pull request #1534 from lift/deprecator-exterminator
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.
6ff0c17
Commits on May 13, 2014
@Shadowfiend Shadowfiend Strip deprecated reference to setFieldsFromJSON. 33c6b6f
@Shadowfiend Shadowfiend Add and use lift.onDocumentReady function.
jQuery’s just assigns to $(document).ready, while the vanilla
one uses Diego Perini’s contentloaded script to set things
up.
14b4895
@Shadowfiend Shadowfiend Drop window.liftAjax legacy compatibility layer. 3c1f33f
@Shadowfiend Shadowfiend javaScriptSettings returns Box[LiftSession=>JsObj]
We remove autoIncludeJSSettings in favor of an Empty Box
returned from javaScriptSettings; we also fix the
capitalization of javaScriptSettings (it was
javascriptSettings).
c6f033b
Commits on May 15, 2014
@Shadowfiend Shadowfiend 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
0547d8b
@eltimn eltimn Remove deprecated code and other updates relating to the previous 4 c…
…ommits.
72bd272
Commits on May 18, 2014
@Shadowfiend Shadowfiend Merge pull request #1562 from lift/lift_30-with-master-and-1560
Merge with master + deprecated mongo/ConnectionIdentifier code removal.
ad41071
Commits on May 20, 2014
@farmdawgnation farmdawgnation Bump version to 3.0-M0. 9d6f959
@farmdawgnation farmdawgnation Bump to 3.0-SNAPSHOT for forward development. c8e8312
@Shadowfiend Shadowfiend Merge pull request #1559 from lift/outline-scripts
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.
d2ee93e
Commits on May 22, 2014
@serveace serveace ListenerManager.listenerService registration fix
Ensure the correct updateListeners function is called when a listener is added.
8b580d8
Commits on May 23, 2014
@Shadowfiend Shadowfiend Merge pull request #1567 from serveace/lift_30
ListenerManager.listenerService AddAListener fix

Ensure the correct updateListeners function is called when a listener is added.
748ceaa
Commits on May 24, 2014
@Shadowfiend Shadowfiend Hack-and-slash getting Lift 3 on 2.11.1.
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
6435693
@Shadowfiend Shadowfiend Add webkit-macros project.
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.
6413f58
@Shadowfiend Shadowfiend First pass at a c"" macro for CssSelectors.
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.
0ae5fb5
@Shadowfiend Shadowfiend Add AttrModifyingSelector to CssSelector.
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.
37287d7
@Shadowfiend Shadowfiend The c macro now infers AttrModifyingSelector.
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.
02a3fe9
@Shadowfiend Shadowfiend More thorough tests for macro sub-node parsing. 3a2800d
Commits on Jun 02, 2014
@Shadowfiend Shadowfiend Add early draft of CSS selector reference docs. c3a10d4
Commits on Jun 03, 2014
@Shadowfiend Shadowfiend CSS selector transforms doc now lists available selectors. c258c76
Commits on Jun 04, 2014
@Shadowfiend Shadowfiend Added almost all CSS modification rules to docs. 7e5c37f
Commits on Jun 06, 2014
@Shadowfiend Shadowfiend Ignore generated docs. 37fd576
@Shadowfiend Shadowfiend Detailed ^^ and ^* operators in docs. 46c2d84
@Shadowfiend Shadowfiend Add some more general details on CSS transforms.
This includes the fact that they’re just
(NodeSeq)=>NodeSeq.
fe46ee1
@Shadowfiend Shadowfiend Add information about transformation functions. 4c3ced7
@Shadowfiend Shadowfiend Fixed a couple of markup errors in docs. 3cea513