8/23/2013 12:44:32 AM
-> getName for sending back product info in account timeline
Fix major bug in account timeline when populating blocking events
Fix bugs introduced during code review
Fix DateTimeHelper in entitlement for immediate chnage when datetime ends up in the future
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
8/20/2013 6:20:28 PM
master (RBAC changes)
Conflicts:
.idea/libraries/Maven__com_ning_billing_killbill_api_0_5_0.xml
.idea/libraries/Maven__com_ning_billing_killbill_entitlement_test_jar_tests_0_4_1_SNAPSHOT.xml
.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_notification_0_2_5.xml
.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_notification_0_3_0.xml
.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_notification_0_3_1_SNAPSHOT.xml
.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_payment_0_2_5.xml
.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_payment_0_3_0.xml
.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_payment_0_3_1_SNAPSHOT.xml
account/killbill-account.iml
api/killbill-internal-api.iml
beatrix/killbill-beatrix.iml
beatrix/src/test/resources/killbill-notification-test.tar.gz
beatrix/src/test/resources/killbill-payment-test.tar.gz
catalog/killbill-catalog.iml
entitlement/killbill-entitlement.iml
entitlement/src/main/java/com/ning/billing/entitlement/api/BlockingAccountUserApi.java
entitlement/src/test/java/com/ning/billing/entitlement/block/TestDefaultBlockingApi.java
invoice/killbill-invoice.iml
invoice/src/main/java/com/ning/billing/invoice/InvoiceDispatcher.java
invoice/src/test/java/com/ning/billing/invoice/TestInvoiceHelper.java
jaxrs/killbill-jaxrs.iml
jaxrs/src/main/java/com/ning/billing/jaxrs/json/CatalogJsonSimple.java
jaxrs/src/main/java/com/ning/billing/jaxrs/json/PlanDetailJson.java
jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
junction/killbill-junction.iml
osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml
osgi-bundles/bundles/jruby/src/main/java/com/ning/billing/osgi/bundles/jruby/JRubyPaymentPlugin.java
osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml
osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml
osgi-bundles/tests/beatrix/killbill-osgi-bundles-test-beatrix.iml
osgi-bundles/tests/beatrix/src/test/java/com/ning/billing/osgi/bundles/test/TestPaymentPluginApi.java
osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml
osgi/killbill-osgi.iml
overdue/killbill-overdue.iml
overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueStateApplicator.java
overdue/src/main/java/com/ning/billing/overdue/config/DefaultOverdueState.java
payment/killbill-payment.iml
payment/src/main/java/com/ning/billing/payment/provider/DefaultNoOpPaymentProviderPlugin.java
payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java
pom.xml
server/killbill-server.iml
server/src/test/java/com/ning/billing/jaxrs/KillbillClient.java
subscription/killbill-subscription.iml
tenant/killbill-tenant.iml
usage/killbill-usage.iml
util/killbill-util.iml
|
