User: islandusurper Branch: HEAD Date: Tue, 23 Mar 2010 14:36:57 +0000 Modified files: /modules/ubercart/payment/uc_authorizenet uc_authorizenet.module /modules/ubercart/shipping/uc_ups uc_ups.admin.inc /modules/ubercart/uc_attribute uc_attribute.css /modules/ubercart/uc_catalog uc_catalog.pages.inc /modules/ubercart/uc_file uc_file.module /modules/ubercart/uc_order uc_order.admin.inc uc_order.module /modules/ubercart/uc_reports uc_reports.admin.inc uc_reports.module /modules/ubercart/uc_roles uc_roles.module /modules/ubercart/uc_stock uc_stock.admin.inc uc_stock.module /modules/ubercart/uc_taxes uc_taxes.admin.inc Log message: Merge changes from 6.x-2.x: [#675236] by j0rd: Make style selector more specific. by TR: Properly format timezone offset in uc_reports help strings [#690740] by wimh: Don't print stock decrement message if stock isn't changed #421366 by cha0s and TR: Replace br, br/ and hr tags with their XHTML-compliant equavalents. [#693462] by TR: Add a checkall checkbox to the node/%/edit/stock page Links: 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/uc_attrib... 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_order/... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_order/... 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_taxes/...