killbill-memoizeit

<< < 184 185 186 187 188 > >>

Merge master inot integration branch

2/2/2012 4:58:48 PM

stephane brossier

Commit: 23e087d

Parents: c489b56

Merge branch 'master' into inv-ent-integration Conflicts: account/src/main/java/com/ning/billing/account/dao/DefaultAccountDao.java payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java

2/2/2012 4:32:35 PM

stephane brossier

Commit: c489b56

Parents: 70f3009
9c9075a

Merge branch 'master' of github.com:ning/killbill Conflicts: util/src/main/resources/com/ning/billing/util/ddl.sql

2/2/2012 4:29:47 PM

stephane brossier

Commit: 9c9075a

Parents: 43001a7
d428a9f

Fix to accountDao; Implemented MockPaymentProviderPlugin; …

1/31/2012 4:48:06 AM

Added more fields to Credit Card payment method

alena

Commit: d428a9f

Parents: 542ff8e

fixed price work

2/2/2012 5:35:49 PM

Jeff Certain

Commit: e2c1009

Parents: 70f3009

Work on integration test

2/2/2012 4:25:45 PM

stephane brossier

Commit: 70f3009

Parents: b73c312

updates to allow fixed and recurring amounts to be correctly …

2/2/2012 4:19:11 PM

stored as nulls; fixed aggregation issues

Jeff Certain

Commit: b73c312

Parents: 18b518c

Merge branch 'inv-ent-integration' of github.com:ning/killbill …

2/1/2012 7:32:27 PM

into inv-ent-integration

stephane brossier

Commit: 18b518c

Parents: 5a8541c
e7c40ce

Merge branch 'inv-ent-integration' of git@github.com:ning/killbill …

2/1/2012 7:31:06 PM

into inv-ent-integration

Martin Westhead

Commit: e7c40ce

Parents: 934c93f
91cff84

beatrix tests

2/1/2012 7:29:50 PM

Jeff Certain

Commit: 91cff84

Parents: 4d56fbf
e72d227