killbill-aplcache

<< < 13 14 15 16 17 > >>

Refactoring BCD calculation because it has so much code it deserves …

3/2/2012 3:45:03 PM

its own class

Martin Westhead

Commit: de17d65

Parents: 82167b2

Refactoring BCD calculation because it has so much code it deserves …

3/2/2012 2:33:30 PM

its own class

Martin Westhead

Commit: 82167b2

Parents: 0684289

added toJodaPeriod to Duration and DefaultDuration

4/17/2012 6:04:24 PM

Jeff Certain

Commit: 3d08f6c

Parents: 01a0674

update history_id -> history_record_id

4/17/2012 6:02:35 PM

Jeff Certain

Commit: 01a0674

Parents: bdb0dea

account email stack

4/17/2012 5:08:09 PM

Jeff Certain

Commit: bdb0dea

Parents: e25112b

Merge branch 'integration' into server NOT SO TRIVIAL MERGE.... …

4/14/2012 12:17:39 AM

PFFFF...

Conflicts:
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementSqlDao.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EventSqlDao.java
	entitlement/src/main/resources/com/ning/billing/entitlement/engine/dao/EventSqlDao.sql.stg
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
	payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPlugin.java
	payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java

stephane brossier

Commit: e25112b

Parents: ee32296
2f8a863

Payment api change to include context

4/12/2012 5:31:29 PM

alena

Commit: 2f8a863

Parents: 8c9dfeb

Merge branch 'integration' into payment-plus-account

4/12/2012 1:48:34 PM

alena

Commit: 8c9dfeb

Parents: ec8beb6
067c9d4

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

4/12/2012 1:48:07 PM

into integration

alena

Commit: 067c9d4

Parents: df38ad2
00c715b

Merge

4/9/2012 12:29:34 AM

alena

Commit: df38ad2

Parents: 4e177eb
91d0bc0