Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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: dragos/framework
...
head fork: lift/framework
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Aug 04, 2011
@kevinpeno kevinpeno fixes #1083 d139670
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