killbill-memoizeit

Separate control tags and descriptive tags; add ControlTagType …

1/11/2012 9:07:10 PM

enum; add tests; modify account

jeff

Commit: 3557900

Tree: 22f3ade

Parents: 39269b6
5f2dbaf

improve checks for existence of accounts on create/update; …

1/6/2012 10:34:20 PM

add change notifications for account (time zone, locale, next billing date); update dao tests to check time zone, locale, next billing date

jeff

Commit: 39269b6

Tree: 02cf3e8

Parents: add96cb

add time zone, locale, and next billing date to Account; move …

1/6/2012 9:29:56 PM

custom field and tag store tests to util

jeff

Commit: add96cb

Tree: bd76152

Parents: 0f95ee0

move BillingEvent and BllingEventSet to Invoice

1/6/2012 4:57:27 PM

jeff

Commit: 0f95ee0

Tree: 253f95a

Parents: 8f13518

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

1/25/2012 2:18:21 AM

(picking up payment/invoice integration work)

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationNotification.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/invoice/DefaultInvoicePaymentApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
	invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java
	invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoice.java
	invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
	pom.xml

Jeff Certain

Commit: 65367f9

Tree: d270f38

Parents: 011d450

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

1/24/2012 9:00:00 PM

(picking up payment/invoice integration work)

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationNotification.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/invoice/DefaultInvoicePaymentApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
	invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java
	invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoice.java
	invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
	pom.xml