User: rszrama Branch: DRUPAL-5 Date: Tue, 29 Jul 2008 22:22:49 +0000 Added files: /modules/ubercart/docs hooks.php /modules/ubercart/payment/uc_payment_pack uc_payment_pack.info uc_payment_pack.install uc_payment_pack.module /modules/ubercart/payment/uc_recurring uc_recurring.css uc_recurring.info uc_recurring.install uc_recurring.module /modules/ubercart/shipping/uc_shipping/images package.gif ship.gif /modules/ubercart/uc_attribute/po hu.po /modules/ubercart/uc_cart_links/po uc_cart_links.pot /modules/ubercart/uc_file/po uc_file.pot /modules/ubercart/uc_file uc_file.js /modules/ubercart/uc_product/po es.po /modules/ubercart/uc_product_kit/po es.po /modules/ubercart/uc_repeater/po es.po /modules/ubercart/uc_reports/po uc_reports.pot /modules/ubercart/uc_reports uc_reports.css uc_reports.info uc_reports.install uc_reports.module /modules/ubercart/uc_roles/po uc_roles.pot /modules/ubercart/uc_stock/po uc_stock.pot /modules/ubercart/uc_stock uc_stock.css uc_stock.info uc_stock.install uc_stock.module uc_stock_workflow.inc /modules/ubercart/uc_store/countries afghanistan_4_1.cif andorra_20_1.cif argentina_32_1.cif aruba_533_1.cif australia_36_2.cif austria_40_1.cif belgium_56_1.cif bulgaria_100_1.cif costa_rica_188_1.cif croatia_191_1.cif czech_203_1.cif dominican_republic_214_1.cif greece_300_1.cif hong_kong_344_1.cif hungary_348_1.cif india_356_1.cif indonesia_360_1.cif israel_376_1.cif korea_republic_of_410_1.cif latvia_428_1.cif mexico_484_1.cif peru_604_1.cif portugal_620_1.cif saint_lucia_662_1.cif taiwan_158_1.cif thailand_764_1.cif turkey_792_1.cif ukraine_804_1.cif united_arab_emirates_784_1.cif venezuela_862_1.cif /modules/ubercart/uc_store/po es.po /modules/ubercart/uc_taxes/po es.po Removed files: /modules/ubercart/uc_importer README.txt /modules/ubercart/uc_store/includes XML2Array.php Modified files: /modules/ubercart/payment/uc_2checkout uc_2checkout.info uc_2checkout.module /modules/ubercart/payment/uc_authorizenet uc_authorizenet.info uc_authorizenet.module /modules/ubercart/payment/uc_credit uc_credit.info uc_credit.install uc_credit.js uc_credit.module /modules/ubercart/payment/uc_cybersource uc_cybersource.info uc_cybersource.module /modules/ubercart/payment/uc_payment test_gateway.info uc_payment.info uc_payment.install uc_payment.js uc_payment.module uc_payment_checkout_pane.inc uc_payment_order_pane.inc uc_payment_workflow.inc /modules/ubercart/payment/uc_paypal uc_paypal.info uc_paypal.install uc_paypal.module /modules/ubercart/shipping/uc_flatrate uc_flatrate.info uc_flatrate.install uc_flatrate.module /modules/ubercart/shipping/uc_quote uc_quote.info uc_quote.install uc_quote.js uc_quote.module /modules/ubercart/shipping/uc_shipping uc_shipping.info uc_shipping.install uc_shipping.module /modules/ubercart/shipping/uc_ups uc_ups.info uc_ups.install uc_ups.module /modules/ubercart/shipping/uc_usps uc_usps.info uc_usps.install uc_usps.module /modules/ubercart/shipping/uc_weightquote uc_weightquote.info uc_weightquote.install uc_weightquote.module /modules/ubercart/uc_attribute uc_attribute.css uc_attribute.info uc_attribute.install uc_attribute.module /modules/ubercart/uc_cart uc_cart.css uc_cart.info uc_cart.install uc_cart.js uc_cart.module uc_cart_block.css uc_cart_block.js uc_cart_checkout_pane.inc uc_cart_workflow.inc /modules/ubercart/uc_cart_links uc_cart_links.info uc_cart_links.install uc_cart_links.module /modules/ubercart/uc_catalog uc_catalog.css uc_catalog.info uc_catalog.install uc_catalog.module /modules/ubercart/uc_file uc_file.css uc_file.info uc_file.install uc_file.module /modules/ubercart/uc_googleanalytics uc_googleanalytics.info uc_googleanalytics.module /modules/ubercart/uc_importer uc_importer.info uc_importer.module /modules/ubercart/uc_notify uc_notify.info uc_notify.module /modules/ubercart/uc_order/templates admin.itpl.php customer.itpl.php /modules/ubercart/uc_order uc_order.css uc_order.info uc_order.install uc_order.js uc_order.module uc_order_line_item.inc uc_order_order_pane.inc uc_order_workflow.inc /modules/ubercart/uc_product uc_product.css uc_product.info uc_product.install uc_product.js uc_product.module /modules/ubercart/uc_product_kit uc_product_kit.info uc_product_kit.install uc_product_kit.module /modules/ubercart/uc_repeater uc_repeater.info uc_repeater.module /modules/ubercart/uc_roles uc_roles.css uc_roles.info uc_roles.install uc_roles.module /modules/ubercart/uc_store/images address_book.gif alert.gif copy.gif error.gif info.gif menu_customers.gif menu_customers_small.gif menu_help.gif menu_help_small.gif menu_orders.gif menu_orders_small.gif menu_products.gif menu_products_small.gif menu_reports.gif menu_reports_small.gif menu_store_settings.gif menu_store_settings_small.gif order_delete.gif order_edit.gif order_view.gif print.gif store_monitor.gif store_monitor_small.gif /modules/ubercart/uc_store uc_country_select.js uc_store.css uc_store.info uc_store.install uc_store.js uc_store.module /modules/ubercart/uc_taxes uc_taxes.info uc_taxes.install uc_taxes.js uc_taxes.module uc_taxes_workflow.inc Log message: Merging changes to DRUPAL-5 branch; trying to fix stuff... :-/ Links: http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/docs/hook... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_attrib... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart_l... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/p... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_repeat... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_report... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_report... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_report... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_report... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_report... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_roles/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_stock/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/payment/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/shipping/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_attrib... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_attrib... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_attrib... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_attrib... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart_l... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart_l... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_cart_l... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_file/u... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_google... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_google... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_import... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_import... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_notify... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_notify... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_repeat... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_repeat... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_roles/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_roles/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_roles/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_roles/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_store/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_taxes/...