Merge branch 'hotfix/last-release'

var/connect/Doofinder_Feed.xml

@@ -1,5 +1,5 @@
 <_>
-   <form_key>bV1iT6HzjNl4kcCc</form_key>
+   <form_key>rwFjwWZ3fJZfqMeG</form_key>
    <name>Doofinder_Feed</name>
    <channel>community</channel>
    <version_ids>
@@ -49,10 +49,11 @@ You can get more info and create your account visiting the Doofinder site:
 http://www.doofinder.com</description>
    <license>Open Software License (OSL 3.0)</license>
    <license_uri>http://opensource.org/licenses/osl-3.0.php</license_uri>
-   <version>1.5.8</version>
+   <version>1.5.9</version>
    <stability>stable</stability>
-   <notes>Don&apos;t display sale price if price is disabled.
-Adjustments.</notes>
+   <notes>Fixed categories with HTML in their names.
+Added UTF-8 filters to categories.
+Fixed issue with JS merge in admin.</notes>
    <authors>
       <name>
          <name>Carlos Escribano Rey</name>
@@ -81,7 +82,7 @@ Adjustments.</notes>
             <max/>
          </max>
          <files>
-            <files>                                                               </files>
+            <files>                                                                </files>
          </files>
       </package>
       <extension>
@@ -143,8 +144,4 @@ Adjustments.</notes>
          <ignore/>
       </ignore>
    </contents>
-   <page>1</page>
-   <limit>200</limit>
-   <folder/>
-   <package/>
 </_>

var/connect/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
     <name>Doofinder_Feed</name>
-    <version>1.5.8</version>
+    <version>1.5.9</version>
     <stability>stable</stability>
     <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
     <channel>community</channel>
@@ -48,12 +48,13 @@ Doofinder is fast and innovative. With no doubt, it is the best search engine fo
 You can get more info and create your account visiting the Doofinder site:&#xD;
 &#xD;
 http://www.doofinder.com</description>
-    <notes>Don't display sale price if price is disabled.&#xD;
-Adjustments.</notes>
+    <notes>Fixed categories with HTML in their names.&#xD;
+Added UTF-8 filters to categories.&#xD;
+Fixed issue with JS merge in admin.</notes>
     <authors><author><name>Carlos Escribano Rey</name><user>doofinder</user><email>carlos@doofinder.com</email></author></authors>
-    <date>2015-10-16</date>
-    <time>11:02:55</time>
-    <contents><target name="magecommunity"><dir name="Doofinder"><dir name="Feed"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><file name="View.php" hash="f37ade9cc28a22a1c94fc01126e5cf4d"/></dir><dir name="Map"><file name="Additional.php" hash="522caf3102a88aac449ff4dc50944e0c"/></dir></dir><file name="Integration.php" hash="f822cf2224c2ec05b0fbf73b59ea30a7"/><dir name="Settings"><dir name="Buttons"><file name="Generate.php" hash="8fefeac31cadaa2b5fce9583722e6f1e"/><file name="ViewLog.php" hash="75cf8fe0360b4d59531e18e268d59fc2"/></dir><dir name="Panel"><file name="Datetime.php" hash="19d1cc4450994eabdc6f328f9995c1d3"/><file name="Description.php" hash="24a4a81ae3c119fdf2ddbb6fa82b352c"/><file name="File.php" hash="d116bd06df07e95ec7dc2f03cc198b44"/><file name="Layerdescription.php" hash="dfecb542ba12e86c86f9b4e87cbf14f1"/><file name="Message.php" hash="258b29be9ea5f5df7dba87a031202d17"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="c1b3d0887131ba1d9ea87acc45994aa9"/><file name="Log.php" hash="e70de4ed9e54f2fbe20b48458c7d9ce8"/><file name="Tax.php" hash="1de7223ca410e606c57cf6db83c05ce2"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><file name="Cron.php" hash="651566578ef3d30a70436583d36ce8fa"/></dir></dir></dir></dir><file name="Config.php" hash="f01d66073ae116667a5a630eaedcab8f"/><file name="Cron.php" hash="18f226a09cdfbb2aa08b8a77f18b6067"/><file name="Generator.php" hash="ee9ab9b16a40e282bcdc4e2bcbd5a374"/><file name="Log.php" hash="fdae10c4f98d56ed7ecd5938b3c552ba"/><dir name="Map"><dir name="Product"><file name="Abstract.php" hash="4f28e16db4f735c1338dac41cbcb5da5"/><file name="Associated.php" hash="81d51b25df5f27822cee905b98242ce1"/><file name="Bundle.php" hash="0f668bba045bd80514bea6260668b2d8"/><file name="Configurable.php" hash="7d3a36bd7ce26844f4c820c09cf07258"/><file name="Downloadable.php" hash="4d1c3dda4943647a2173edbfbf179664"/><file name="Grouped.php" hash="37fe2b5a3e01f1b0ef4ae52c1338b45c"/><file name="Simple.php" hash="1cada9db30b343293c10d1f917af53aa"/><file name="Virtual.php" hash="fe86523e76131d85af7a1e2043311855"/></dir></dir><dir name="Mysql4"><dir name="Cron"><file name="Collection.php" hash="6437a12112aff052550025d0412673dd"/></dir><file name="Cron.php" hash="356daf58d5981c1817a00644221ef326"/><dir name="Log"><file name="Collection.php" hash="89e699b982fc461cf8b62fe90850f39d"/></dir><file name="Log.php" hash="95f78fef747c1bd3231b4be9aa89b2d1"/></dir><dir name="Observers"><file name="Feed.php" hash="233ab72f92f811e6fcae8b6639bbafe6"/><file name="Logs.php" hash="d59f4f35eeffa70916dbc4c808ad8eeb"/><file name="Schedule.php" hash="645b80971bcb37967356b73797ac025b"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="929700b2b3a69aa2b7341f6687f7be53"/></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Map"><file name="Additional.php" hash="9f55d24bc29c2de44b16c7a8208f1dfc"/></dir></dir><file name="Reset.php" hash="5b130df6045d52f704472db6696ada4c"/><dir name="Source"><dir name="Product"><file name="Attributes.php" hash="c769955f5fd8e43ec8be1d9ba1937f23"/></dir></dir></dir></dir><file name="Tools.php" hash="a62c5f19ebf8d67382409590f112a67a"/></dir><dir name="Test"><dir name="Controller"><dir name="Index"><dir name="fixtures"><file name="testConfig.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/><file name="testFeed.yaml" hash="694cf25a35a9a301a8ae678866937909"/><file name="testIndex.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/></dir><dir name="providers"><file name="testConfig.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/><file name="testFeed.yaml" hash="1ea2f638be8fdcea22ef47767ed8d7db"/><file name="testIndex.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/></dir></dir><file name="Index.php" hash="2771de706303653d039818bd0f6590ea"/></dir><dir name="Model"><dir name="Product"><dir name="expectations"><file name="testGenerator.yaml" hash="232dda1f4fd88b8ef081393f08044731"/></dir><dir name="fixtures"><file name="testGenerator.yaml" hash="df25e3ca67fd98ab1b933c4951c599ef"/></dir><dir name="providers"><file name="testGenerator.yaml" hash="84779d5dcd8d92abdecf0cd5ee65cfb0"/></dir></dir><file name="Product.php" hash="6c45ae2b36c6cc721ef634855ed6d596"/></dir></dir><dir name="controllers"><file name="DoofinderFeedFeedController.php" hash="384e8cbe92eea86373965926fdb15d81"/><file name="DoofinderFeedLogController.php" hash="889b7338d50652f1c55afc2bd814eea4"/><file name="FeedController.php" hash="5b26a09438c72c48dc2781ed6abbea23"/><file name="IndexController.php" hash="3c3622cddfbdc0b83ec91ed8670d0c98"/></dir><dir name="etc"><file name="config.xml" hash="406cd7c3d8b020d9019c936d39dc1c23"/><file name="system.xml" hash="0737fb34cb130408ce96ff46270bdf53"/></dir><dir name="sql"><dir name="doofinder_feed_setup"><file name="mysql4-install-1.5.4.php" hash="9dc5ed4e10febbe75ab1911259a1c9fe"/><file name="mysql4-install-1.5.7.php" hash="2e54d97fe55303f3c73293cf5357864a"/><file name="mysql4-upgrade-1.5.4-1.5.5.php" hash="df7158f6d6cdded9bdfc5cb72c1dc8e3"/><file name="mysql4-upgrade-1.5.5-1.5.6.php" hash="0f3ca5263356a0bc83d9352b463944dc"/><file name="mysql4-upgrade-1.5.6-1.5.7.php" hash="b0180770655f36d6723483aa3bd1541f"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Doofinder_Feed.xml" hash="9d3b6fbbbec12708461c33260715451c"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="doofinder.xml" hash="a7b9105a4e613086340b042845793d9f"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="doofinder.xml" hash="48a8636096950914917461260416c355"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="doofinder"><file name="admin.js" hash="5ddb9b177809c82950c687bd8045bed7"/></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="doofinder"><file name="styles.css" hash="e0b2a82e1da41d1c0061e5403f14939f"/></dir></dir></dir></dir></target></contents>
+    <date>2015-11-04</date>
+    <time>09:21:16</time>
+    <contents><target name="magecommunity"><dir name="Doofinder"><dir name="Feed"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><file name="View.php" hash="a4c92c33f75b38fb3b58a22989a7789f"/></dir><dir name="Map"><file name="Additional.php" hash="f92cf316816687e23f4359ff49f139de"/></dir></dir><file name="Integration.php" hash="5f8249548999b17f62daf2370e28466b"/><dir name="Settings"><dir name="Buttons"><file name="Generate.php" hash="bdb9eb422613f219e919b3d696c34e3d"/><file name="ViewLog.php" hash="c06100281b58e1934314dac0c8a715b7"/></dir><dir name="Panel"><file name="Datetime.php" hash="c3c5dd3f701a8cc5dd858e88af48e14a"/><file name="Description.php" hash="0e52f69f685d4a7d761079ac4e7fdef3"/><file name="File.php" hash="ed013b6c857e20a0d8662ae3ab92a80a"/><file name="Layerdescription.php" hash="ab3be919f18ab3b4ea29588e802faa0a"/><file name="Message.php" hash="0f1ee836d228e67d9886aa8f8371f1fd"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="5b96feff908dab3c25eedefff973c65f"/><file name="Log.php" hash="9de44d77baabac18b2e20b6445beec80"/><file name="Tax.php" hash="28a09225a5692f5f52c1cfe26dce4996"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><file name="Cron.php" hash="2337232946187cd8d05e0de7eaffa278"/></dir></dir></dir></dir><file name="Config.php" hash="4e5038f086e6f900669e63e246cf1fa4"/><file name="Cron.php" hash="e4a9f1d982b5f8f1b0c247d9a3295d70"/><file name="Generator.php" hash="1528364c78fd89fc31ae24e5d59e6241"/><file name="Log.php" hash="dbfc5029f22a820f7c26f4c7742d6531"/><dir name="Map"><dir name="Product"><file name="Abstract.php" hash="7349688cabdc418d9dff37970b160176"/><file name="Associated.php" hash="7950386743a41aacb10902747d78956e"/><file name="Bundle.php" hash="7be9e63899abbc502dc819d9af00ad68"/><file name="Configurable.php" hash="2d2da31b5e76c123ada113b2f8a08c75"/><file name="Downloadable.php" hash="8c6755814ebcf96deed6cb91e7425f30"/><file name="Grouped.php" hash="91ede45a619b263a9cf363838a6ca630"/><file name="Simple.php" hash="bace15bc059b421832fc6ad9f05ed4cc"/><file name="Virtual.php" hash="92f939b3bb472acb4af5a04a18dc0d42"/></dir></dir><dir name="Mysql4"><dir name="Cron"><file name="Collection.php" hash="e6775b1237ee7ea81f570e52923b1754"/></dir><file name="Cron.php" hash="ee9366ab49b7ade7ca8dc0992e0c3cb7"/><dir name="Log"><file name="Collection.php" hash="9e7533055dafac3362ff597c52ea4fff"/></dir><file name="Log.php" hash="5f7d6fb6352e5c54203340af5256c1cf"/></dir><dir name="Observers"><file name="Feed.php" hash="ce3cd4c68a547f4ded7d7566e9fab91b"/><file name="Logs.php" hash="20dbac95be4e5563ba36d8831b1ddfa9"/><file name="Schedule.php" hash="3e9a156a29543686133bf7049dc68e0c"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="18ede20410abe60f3ac9a2316f6f148c"/></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Map"><file name="Additional.php" hash="d461441e95ecc94873b044c6f2d8d06b"/></dir></dir><file name="Reset.php" hash="54b5013a7626b42deb2b5f5481059aae"/><dir name="Source"><dir name="Product"><file name="Attributes.php" hash="fd27124c283ac43d4943f0c7f12df309"/></dir></dir></dir></dir><file name="Tools.php" hash="6910a4c2861118e42489c3861a7f44b1"/></dir><dir name="Test"><dir name="Controller"><dir name="Index"><dir name="fixtures"><file name="testConfig.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/><file name="testFeed.yaml" hash="694cf25a35a9a301a8ae678866937909"/><file name="testIndex.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/></dir><dir name="providers"><file name="testConfig.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/><file name="testFeed.yaml" hash="1ea2f638be8fdcea22ef47767ed8d7db"/><file name="testIndex.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/></dir></dir><file name="Index.php" hash="2771de706303653d039818bd0f6590ea"/></dir><dir name="Model"><dir name="Product"><dir name="expectations"><file name="testGenerator.yaml" hash="232dda1f4fd88b8ef081393f08044731"/></dir><dir name="fixtures"><file name="testGenerator.yaml" hash="df25e3ca67fd98ab1b933c4951c599ef"/></dir><dir name="providers"><file name="testGenerator.yaml" hash="84779d5dcd8d92abdecf0cd5ee65cfb0"/></dir></dir><file name="Product.php" hash="6c45ae2b36c6cc721ef634855ed6d596"/></dir></dir><dir name="controllers"><file name="DoofinderFeedFeedController.php" hash="5226695d0b9f75d960ed67484d16e20d"/><file name="DoofinderFeedLogController.php" hash="c14b9c988721438344fce086d8f6960a"/><file name="FeedController.php" hash="be67f16693d3ad38ed0e34c5ff7727b6"/><file name="IndexController.php" hash="3dbc5c0805d38ff6b4d718d2217e5ca5"/></dir><dir name="etc"><file name="config.xml" hash="8bec1d848992809fcdf5e91897f181ec"/><file name="system.xml" hash="0737fb34cb130408ce96ff46270bdf53"/></dir><dir name="sql"><dir name="doofinder_feed_setup"><file name="mysql4-install-1.5.4.php" hash="9dc5ed4e10febbe75ab1911259a1c9fe"/><file name="mysql4-install-1.5.7.php" hash="2e54d97fe55303f3c73293cf5357864a"/><file name="mysql4-upgrade-1.5.4-1.5.5.php" hash="df7158f6d6cdded9bdfc5cb72c1dc8e3"/><file name="mysql4-upgrade-1.5.5-1.5.6.php" hash="0f3ca5263356a0bc83d9352b463944dc"/><file name="mysql4-upgrade-1.5.6-1.5.7.php" hash="b0180770655f36d6723483aa3bd1541f"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Doofinder_Feed.xml" hash="9d3b6fbbbec12708461c33260715451c"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="doofinder.xml" hash="a7b9105a4e613086340b042845793d9f"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="doofinder.xml" hash="48a8636096950914917461260416c355"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="doofinder"><file name="admin.js" hash="ca050b0527ae101c75532fbca1c4a274"/></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="doofinder"><file name="styles.css" hash="16d447107e9507136347338f067be156"/></dir></dir></dir></dir></target></contents>
     <compatible/>
     <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
 </package>