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: liveink/framework
...
head fork: lift/framework
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jul 18, 2011
@eltimn eltimn Issue 1066 - Add support to JObjectParser for Lists of BSON types fbe22c1
Commits on Jul 23, 2011
Joni Freeman Improve return type of 'merge' function using fundep encoding f24ceaa
Joni Freeman Use NameTransformer to unmangle symbolic names, fixes 1075 1c9629e
Commits on Aug 03, 2011
@dpp dpp Made QueryParameters a proper subclass d840afd
Commits on Aug 04, 2011
@kevinpeno kevinpeno fixes #1083 d139670
Commits on Aug 05, 2011
@nafg nafg Fix #1072 850c5c4
@nafg nafg Fix #1068 8b02cfc
@nafg nafg Fix #1076 764ed5a
@nafg nafg Merge branch 'wip_1068_1072_1076'
* wip_1068_1072_1076:
  Fix #1076
  Fix #1068
  Fix #1072
9d850e7
Commits on Aug 10, 2011
Joni Freeman Fix extraction when case class has a companion object (fixes 1073) 3a110ba
Joni Freeman Fix parameter parsing in scala 2.9 a27e7c4
Joni Freeman Improve custom serializers to enable interception of collections (fixes 0745393
Commits on Aug 21, 2011
@indrajitr indrajitr Make jar path more unambiguous d377720
@indrajitr indrajitr Fix shell script for Windows (thanks to @kevinpeno). Closes #1083. b1852b9
@indrajitr indrajitr No need to use junit runner anymore, we are directly on specs now 8503ca7
@indrajitr indrajitr Adjust imports c562a91
@indrajitr indrajitr Need to have `util.control._` referred explicitly as `scala.util.cont…
…rol._` or else it would conflict with net.liftweb.util.

This is necessary during grand builds (e.g., aggregated scaladoc).
3b47286
@indrajitr indrajitr (re)-fix import 7b7376d
@indrajitr indrajitr Have a logback config to keep embedded jetty logging at saner (INFO) …
…level
b2c2c47
@indrajitr indrajitr Update logback config per newer recommendation (see: http://logback.q… 41703ce
@indrajitr indrajitr deprecate ParseDouble and remove it's usage cbe9037
Commits on Aug 23, 2011
@dpp dpp Closes #1094. Closes #1086. Improved handling of statelessness includ…
…ing a snippet trait that handles a given snippet in stateless mode and the ability to inspect cookies and user agents to determine if a request should be treated as stateless
23bfc86
@dpp dpp Closes #919. Makes it easier to invoke LiftScreen and Wizard from Loc…
….Snippet params
f40deb7
@dpp dpp Closes #1089. The Mailer trait is not usable outside the net.liftweb.…
…util package
1c861f6
Commits on Aug 24, 2011
@dpp dpp Closes #1091. Better null testing and better Elem testing for bind() …
…and CSS Selector Transforms
e1cf30c
@dpp dpp Closes #938. Closes #1095. Better support to asJsExp in foreign key r…
…eferences. Better handling of Nullable fields in forms and display
d2d60df
Commits on Aug 25, 2011
@dpp dpp Closes #1030. Ability to remove attributes or individual parts of a c…
…lass attribute in CSS Selector Transforms
b0b7478
@dpp dpp Made the Mailer more flexible for HTML body parts a276004
@dpp dpp Closes #1082. Fixes the damage done by 1054 f254f08
@dpp dpp Closes #1034. Closes #1032. Screen and Wizard honor FormParam entries…
… and it's easier to add FormParams to MappedField
d98b451
@dpp dpp Closes #1025. namespace-style attributes for designer-friendly snippe…
…t invocation
4b5cd52
@dpp dpp Closes #1024 (aka 2^10). Fixed implicit conversions and fixed up some…
… header, etc. stuff on responses
dd83b19
lkuczera Closes #1093 - overload S.? to enable locale choosing 8b35ca7
Commits on Aug 26, 2011
@dpp dpp Fixed a little bug related to dbIncludeInForm 758240a
@dpp dpp Added more information to comet failures cf2a525
@dpp dpp Added TemplateBox for better integration with Templates() template lo…
…okup
a3eca64
@dpp dpp Updated the method signature of StatelessBehavior per Naftoli's sugge…
…stion
cf05993
@dpp dpp Updated CometActor documentation b03d34b
@dpp dpp Shut down LAPinger on servlet shutdown 547f044
@dpp dpp Fixed SHtml.memoize to not be wacky c16413f
Commits on Aug 29, 2011
@nafg nafg Test #1088 -- MappedField#equals requires getClass to equal. Also, re…
…spect scala.Equals#canEqual
27e634c
@nafg nafg Test #1087 -- Menu.param{s,}[T <: AnyRef] 507439b
@nafg nafg MappedField#canEqual: override is unnecessary 2e4de02
@nafg nafg Merge branch 'wip_1087_1088'
Fixes #1087, #1088

* wip_1087_1088:
  MappedField#canEqual: override is unnecessary
  Test #1087 -- Menu.param{s,}[T <: AnyRef]
  Test #1088 -- MappedField#equals requires getClass to equal. Also, respect scala.Equals#canEqual
0b5068b
lkuczera Closes #1099. Added NotLike b057016
Commits on Aug 30, 2011
@dpp dpp Fixed Internet Date to conform to RFC 1123 4bb0c02
@pbrant pbrant Don't remove parent when transforming children
Closes #1085
54433ff
Commits on Aug 31, 2011
@nafg nafg Rename StatelessBehavior#{behaviorDispatch->statelessDispatch} a8f687f
@nafg nafg Merge branch 'master' of github.com:lift/framework 026a9f4
Commits on Sep 03, 2011
@indrajitr indrajitr Add support for Scala 2.9.1 0f9661a
Commits on Sep 05, 2011
@jeppenejsum jeppenejsum Add appendPostTransaction method on DB, refs #1102 b6af3b9
@jeppenejsum jeppenejsum Merge branch 'master' into jnm_1102 4c04f6f
Commits on Sep 06, 2011
@jeppenejsum jeppenejsum Added appendPostTransaction for DefaultConnectionIdentifier, changed …
…test & deprecation messages. Refs #1102
4a5204c
Commits on Sep 07, 2011
@indrajitr indrajitr Create mocks in example scope for maximum compatibility 1b9c2c5
Commits on Sep 14, 2011
@dpp dpp Closes #1113. Ensures strict evaluation of Atom 1c0980b
Commits on Sep 16, 2011
@jeppenejsum jeppenejsum Don't set dirty_? when loading MappedDecimal. Closes #1116 49de1fc
Commits on Sep 19, 2011
@dpp dpp Added type exclusion stuff. Thanks Miles ef7fba8
Commits on Sep 20, 2011
@dpp dpp Commented out the test that's supposed to fail bf36b4b
@indrajitr indrajitr Keep scala 2.8 compatibility, use error() instead of sys.error() 043ff67
@indrajitr indrajitr Keep the older stable scala version default for now. 300e701
Commits on Sep 21, 2011
@pbrant pbrant Allow unique transform created id attributes
When post-processing a transform created list, keep id attributes as
long as they are unique over the list.

Closes #1110
fafa49b
Commits on Sep 23, 2011
@dpp dpp Made init call onCreate for all currently known parameters 2d1bfbc
@dpp dpp Can't access allParams during init 1cc2a43
@dpp dpp Fixed an off-by-one error in calculating if the last element of a req…
…uest was a /
b1ed911
Commits on Sep 24, 2011
Joni Freeman Parse empty string to JNothing 9de55fc
Commits on Sep 30, 2011
@jeppenejsum jeppenejsum Don't write to MappedBoolean if value hasn't changed. Closes #1121 9a0a4e8
Commits on Oct 02, 2011
@jeppenejsum jeppenejsum Log which property files are being read. Closes #1124 f4b8461
Commits on Oct 03, 2011
@eltimn eltimn Issue 1125 - Add MongoRefListField 7805a44
Commits on Oct 04, 2011
@tuhlmann tuhlmann Created methods to create edit buttons for the different generated pa…
…ges.

Closes #1123
c6ec24f
@tuhlmann tuhlmann Merge remote-tracking branch 'origin/master' 05d43e4
@jeppenejsum jeppenejsum Add emptyForBlank to StringHelpers. Closes #1127 a499905
Commits on Oct 05, 2011
@davewhittaker davewhittaker Squeryl-Record now used the precision and scale defined within (Optio…
…nal)DecimalField.
7d6325f
Commits on Oct 09, 2011
@sjmurdoch sjmurdoch Fixed a minor comment typo 75066b6
Commits on Oct 11, 2011
@davewhittaker davewhittaker Fixed .associate call on one-to-many relations. Update to test cases …
…uncovered another bug with EnumNameTypedField and that is now fixed as well.

Fixed #1131
cbf63af
Commits on Oct 12, 2011
@davewhittaker davewhittaker Made a small typing change to quiet a scala 2.8.0 pattern matching er…
…ror.
e6bab09
Commits on Oct 17, 2011
@dpp dpp Fixed an Atom strictness bug and added some query stuff for mapper 1ffac23
Commits on Oct 18, 2011
@dcbriccetti dcbriccetti Merge pull request #9 from sjmurdoch/patch-1
Fixed a minor comment typo
5a500cd
Commits on Oct 19, 2011
@pr1001 pr1001 Add README outlining the Lift project and how this repository is situ…
…ated within it.
c50e55b
@pr1001 pr1001 Add a LICENSE file that contains the full text of the Apache 2.0 lice…
…nse.
268be53
Joni Freeman Fix performance regression in JSON serialization e3cc1e1
Joni Freeman Find jsonClass from all fields. Fixes #1132 9758e19
Joni Freeman Merge branch 'master' of github.com:lift/framework 686a8f1
Commits on Oct 20, 2011
Joni Freeman Add a test for already fixed bug (commit 9de55fc), fixes #1133 2dbccbb
Commits on Oct 24, 2011
Joni Freeman Remove buggy JArray equals method (fixes #1136) 28c0dea
Commits on Nov 02, 2011
Joni Freeman Helper class to create custom JSON serializers 7c91856
@andreak andreak Closes #1138 Made SetHtml and Replace use jQuery.html() and jQuery.re…
…placeWith() if JqueryArtifacts is chosen as JSArtifact.
0b8ce63
@andreak andreak Merge branch 'master' of github.com:lift/framework a8ec5d8
@andreak andreak Closes #1137 Expose RenderVersion as read-only property S.renderVersion 32fc95b
@andreak andreak Closes #1140 Added onListenersListEmptied() to ListenerManager to be …
…able to react when listerners-list is emptied
ddf1cb8
Commits on Nov 04, 2011
@eltimn eltimn Issue 1118 - Make MongoMetaRecord.useColl as public and move up to Mo…
…ngoMeta
993026c
@jeppenejsum jeppenejsum Added danish translation of core properties. Closes #1129 91c4376
@jeppenejsum jeppenejsum Preserve Enumeration ordering when building display list in MappedEnu…
…m. Closes #1142
4d3ccdc
@jeppenejsum jeppenejsum Preserve Enumeration ordering when building display list in MappedEnu…
…m. Closes #1142
88f3b29
@jeppenejsum jeppenejsum Merge branch 'master' of github.com:lift/framework e2a287d
@jeppenejsum jeppenejsum Disabled test which fails on 2.8.1. due to bug in Enumeration 50162e7
Commits on Nov 07, 2011
@jeppenejsum jeppenejsum Added more methods for looking up a connection using JNDI, compatible…
… with Glassfish.

Added diagnostic logging related to connections.

Closes #1115
d9c6e7c
Commits on Nov 08, 2011
@pr1001 pr1001 Added '+update' to instructions for building Lift in README 42ec31b
@eltimn eltimn Issues 1117,1148,1149 - Add update method in MongoRecord, Add java.ut…
…il.logging.config system property to default build options, MongoRecord should reset dirty flags on save
74ec930
@eltimn eltimn Fixed mongo tests f294b88
Commits on Nov 09, 2011
@pr1001 pr1001 Fix miniscule typo in lift-json README 15b9103
@indrajitr indrajitr Saving to CouchDB doesn't fetch the documents 'id' property. Fixes #961.
Thanks to @hdeshev and @marianoguerra for analysis and the suggested fix.
43c711e
@indrajitr indrajitr Merge pull request #7 from kevinpeno/master
Fix for windows version of liftsh script. Fixes #1083.
52dcc2b
@andreak andreak Closes #1150 6869755
Commits on Nov 10, 2011
@indrajitr indrajitr Disable broken test d644392
@indrajitr indrajitr Merge branch 'master' of github.com:lift/framework 102499e
Commits on Nov 16, 2011
Joni Freeman Add helpers to write in pretty JSON format 560aa5e
Commits on Nov 17, 2011
@jeppenejsum jeppenejsum Lowered log level when failing to get connection using JNDI, since we…
… always try this path, i.e failure is expected if not using JNDI.
8a44406
Commits on Nov 18, 2011
@jeppenejsum jeppenejsum Only reset users's uniqueId when form validation succeeds, not when s…
…howing the form.

This makes it possible to actually correct any validation errors without resending an email.
d32aa89
@jeppenejsum jeppenejsum Updated danish properties 4381c22
@andreak andreak Closes #1152 Introduce LiftRules.cometProcessingTimeout to have confi…
…gurable timeout for comet-requests
fd99d89
Commits on Nov 19, 2011
@andreak andreak Javadoc-fixes to cometProcessingTimeout 1d74b84
Commits on Nov 28, 2011
@dpp dpp Fixed some documentation e04ee61
Commits on Nov 29, 2011
@andreak andreak Closes #1153 Easier customisation of comet-timeouts. 50d6f2a
Commits on Dec 12, 2011
Joni Freeman Simpler and faster way to punctuate lists (fixes #1156) 0556f9f
@dpp dpp Closes #1158. data-lift no longer causes stack overflow. TransientSni…
…ppet trait added
2e18c77
Commits on Dec 13, 2011
Joni Freeman Escape JSON field names (fixes #1161) dde96de
Joni Freeman Merge branch 'master' of github.com:lift/framework e460bb9
Commits on Dec 15, 2011
@andreak andreak Closes #1162 Reacting to comet-timeouts f5774dc
@indrajitr indrajitr Add scala 2.8.2 support ea62cc4
Commits on Dec 16, 2011
@indrajitr indrajitr Keep using Specs for 2.8.1 even for 2.8.2 build
Specs for 2.8.2 is _not_ a drop-in replacement for Specs for 2.8.1
9a1be04
Commits on Dec 19, 2011
Joni Freeman Fix JSON reflection issue for Scala 2.8.2 dff0b6a
Commits on Dec 21, 2011
@indrajitr indrajitr Prepare for 2.4-RC1 624d3ef
Commits on Jan 01, 2012
@indrajitr indrajitr Prepare for 2.4 final 657eee8
Commits on Apr 05, 2013
@dpp dpp Addresses a data bleeding issue with lift-json ea81b2d
@indrajitr indrajitr Prepare for 2.4.1 final be18859