Merge branch 'hotfix/hotfix-release-1.5.9'

doofinder · Nov 4, 2015 · 6c5bc65 · 6c5bc65
2 parents ded0b6b + be9cfac
commit 6c5bc65
Show file tree

Hide file tree

Showing 46 changed files with 310 additions and 32 deletions.
diff --git a/app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php b/app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   blocks
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
 
 class Doofinder_Feed_Block_Adminhtml_Log_View extends Mage_Adminhtml_Block_Widget_Grid
 {

diff --git a/app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php b/app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   blocks
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
 
 class Doofinder_Feed_Block_Adminhtml_Map_Additional extends Mage_Adminhtml_Block_System_Config_Form_Field
 {

diff --git a/app/code/community/Doofinder/Feed/Block/Integration.php b/app/code/community/Doofinder/Feed/Block/Integration.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   blocks
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
 
 class Doofinder_Feed_Block_Integration extends Mage_Core_Block_Abstract
 {

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php b/app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   blocks
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
+
 class Doofinder_Feed_Block_Settings_Buttons_Generate extends Mage_Adminhtml_Block_System_Config_Form_Field
 {
     protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php b/app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   blocks
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
+
 class Doofinder_Feed_Block_Settings_Buttons_ViewLog extends Mage_Adminhtml_Block_System_Config_Form_Field
 {
 

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   blocks
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
 
 class Doofinder_Feed_Block_Settings_Panel_Datetime extends Mage_Adminhtml_Block_System_Config_Form_Field
 {

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   blocks
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
+
 class Doofinder_Feed_Block_Settings_Panel_Description extends Mage_Adminhtml_Block_System_Config_Form_Field
 {
     protected $description = 'You can set the rest of the options for each store separately by modifying the Current Configuration Scope.';

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   blocks
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
+
 class Doofinder_Feed_Block_Settings_Panel_File extends Mage_Adminhtml_Block_System_Config_Form_Field
 {
     /**

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   blocks
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
+
 class Doofinder_Feed_Block_Settings_Panel_LayerDescription extends Doofinder_Feed_Block_Settings_Panel_Description
 {
   protected $description = 'The layer script must be configured separately for each store view by modifying the Current Configuration Scope.';

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   blocks
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
+
 class Doofinder_Feed_Block_Settings_Panel_Message extends Mage_Adminhtml_Block_System_Config_Form_Field
 {
     /**

diff --git a/app/code/community/Doofinder/Feed/Helper/Data.php b/app/code/community/Doofinder/Feed/Helper/Data.php
@@ -6,13 +6,13 @@
 /**
  * @category   Helpers
  * @package    Doofinder_Feed
- * @version    1.5.8
+ * @version    1.5.9
  */
 
 /**
  * Data helper for Doofinder Feed
  *
- * @version    1.5.8
+ * @version    1.5.9
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Helper_Data extends Mage_Core_Helper_Abstract

diff --git a/app/code/community/Doofinder/Feed/Helper/Log.php b/app/code/community/Doofinder/Feed/Helper/Log.php
@@ -1,5 +1,20 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
 
+/**
+ * @category   Helpers
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
+
+/**
+ * Log helper for Doofinder Feed
+ *
+ * @version    1.5.9
+ * @package    Doofinder_Feed
+ */
 class Doofinder_Feed_Helper_Log extends Mage_Core_Helper_Abstract
 {
     const STATUS = 'status';

diff --git a/app/code/community/Doofinder/Feed/Helper/Tax.php b/app/code/community/Doofinder/Feed/Helper/Tax.php
@@ -6,13 +6,13 @@
 /**
  * @category   Helpers
  * @package    Doofinder_Feed
- * @version    1.5.8
+ * @version    1.5.9
  */
 
 /**
  * Tax helper for Doofinder Feed
  *
- * @version    1.5.8
+ * @version    1.5.9
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Helper_Tax extends Mage_Tax_Helper_Data

diff --git a/app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php b/app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   Models
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
 
 class Doofinder_Feed_Model_Adminhtml_System_Config_Backend_Cron extends Mage_Core_Model_Config_Data {
 

diff --git a/app/code/community/Doofinder/Feed/Model/Config.php b/app/code/community/Doofinder/Feed/Model/Config.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.8
+ * @version    1.5.9
  */
 
 /**
  * Config model for Doofinder Feed
  *
- * @version    1.5.8
+ * @version    1.5.9
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Config extends Mage_Core_Model_Config_Data

diff --git a/app/code/community/Doofinder/Feed/Model/Cron.php b/app/code/community/Doofinder/Feed/Model/Cron.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   Models
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
 
 class Doofinder_Feed_Model_Cron extends Mage_Core_Model_Abstract {
 

diff --git a/app/code/community/Doofinder/Feed/Model/Generator.php b/app/code/community/Doofinder/Feed/Model/Generator.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.8
+ * @version    1.5.9
  */
 
 /**
  * Generator model for Doofinder Feed
  *
- * @version    1.5.8
+ * @version    1.5.9
  * @package    Doofinder_Feed
  */
 if (!defined('DS'))

diff --git a/app/code/community/Doofinder/Feed/Model/Log.php b/app/code/community/Doofinder/Feed/Model/Log.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * This file is part of Doofinder_Feed.
+ */
+
+/**
+ * @category   Models
+ * @package    Doofinder_Feed
+ * @version    1.5.9
+ */
 
 class Doofinder_Feed_Model_Log extends Mage_Core_Model_Abstract {
 

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.8
+ * @version    1.5.9
  */
 
 /**
  * Abstract Product Map Model for Doofinder Feed
  *
- * @version    1.5.8
+ * @version    1.5.9
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Abstract extends Varien_Object

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Associated.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Associated.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.8
+ * @version    1.5.9
  */
 
 /**
  * Associated Product Map Model for Doofinder Feed
  *
- * @version    1.5.8
+ * @version    1.5.9
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Associated

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Bundle.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Bundle.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.8
+ * @version    1.5.9
  */
 
 /**
  * Bundle Product Map Model for Doofinder Feed
  *
- * @version    1.5.8
+ * @version    1.5.9
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Bundle

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Configurable.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Configurable.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.8
+ * @version    1.5.9
  */
 
 /**
  * Configurable Product Map Model for Doofinder Feed
  *
- * @version    1.5.8
+ * @version    1.5.9
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Configurable

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Downloadable.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Downloadable.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.8
+ * @version    1.5.9
  */
 
 /**
  * Downloadable Product Map Model for Doofinder Feed
  *
- * @version    1.5.8
+ * @version    1.5.9
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Downloadable

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Grouped.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Grouped.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.8
+ * @version    1.5.9
  */
 
 /**
  * Grouped Product Map Model for Doofinder Feed
  *
- * @version    1.5.8
+ * @version    1.5.9
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Grouped

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Simple.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Simple.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.8
+ * @version    1.5.9
  */
 
 /**
  * Simple Product Map Model for Doofinder Feed
  *
- * @version    1.5.8
+ * @version    1.5.9
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Simple