Commit Graph

125 Commits

Author SHA1 Message Date
Jérôme Nadaud 1c46856686 // Version updated to v2.1.1 2015-03-16 17:41:31 +01:00
Jérôme Nadaud 890f8b846a Merge pull request #23 from dkarvounaris/ivy-patch-missingcss
[-] CSS/JS files not loading when using only "displayNav" without "displayTop"
2015-03-16 09:35:04 +01:00
Dimitrios Karvounaris 663c05f1e1 Upgrade file for 2.1.1 2015-03-15 15:23:45 +01:00
Dimitrios Karvounaris b5141212b4 Delete install 2015-03-15 15:23:25 +01:00
Dimitrios Karvounaris d66ce82bda Upgrade file for 2.1.1 2015-03-15 15:23:15 +01:00
Jérôme Nadaud d827c64a15 Merge pull request #22 from sfroment42/Patch-cms-multishop
[-] MO : Fix blocktopmenu consequence of 1.6.0.12 cms update
2015-03-09 14:32:58 +01:00
Sacha Froment 906392c92e // norms 2015-03-09 11:39:00 +01:00
Sacha Froment b00610de4b [-] MO : Fix cms passing to multishop cf: https://github.com/PrestaShop/PrestaShop/commit/67789cac1f1c94d19a173cd2c6f5b53e81e0d232 2015-03-09 11:35:38 +01:00
Jérôme Nadaud 27d4030676 Merge pull request #18 from indesign47/patch-2
// follow up cf9b22d
2015-03-05 11:17:20 +01:00
indesign47 cef9f320da // follow up cf9b22d 2015-03-05 11:11:18 +01:00
Jérôme Nadaud 05c810a4ac // Version updated to v2.1.0 2015-03-03 12:00:49 +01:00
Gregory Roussac 5d5298e2d9 Merge pull request #17 from wayann/patch-2
[*] Mo : allow override of blocktopmenu
2015-02-27 15:56:07 +01:00
Wayann f651acbb77 allow override of module
set private methods to protected so we can take advantage of the new module overriding function from module.php
2015-02-27 15:48:20 +01:00
Gregory Roussac 024dc6d5c6 Merge pull request #15 from indesign47/patch-1
[-] MO : blocktopmenu -> missing translations
2015-02-23 10:34:51 +01:00
indesign47 cf9b22dbc9 [-] MO : blocktopmenu -> missing translations 2015-02-23 10:08:17 +01:00
Dimitrios Karvounaris 2b2e42e901 [-] Did not add CSS files to output, when hooked in hook "displayNav" instead "displayTop". 2015-02-06 21:55:50 +01:00
Jerome Nadaud f75aa982a4 //Version update 2014-11-10 16:05:10 +01:00
Gregory Roussac b2bcf6da70 Merge pull request #12 from axometeam/patch-2
[*] Error when delete links
2014-10-31 10:10:10 +01:00
Axome 5b78e97267 [*] Error when delete links
Using the wrong variable
2014-10-31 09:20:17 +01:00
Jérôme Nadaud f3bacbefac // Version updated to v2.0.8 2014-10-14 16:00:06 +02:00
Sacha Froment 7d2011d080 // fix thumbnail sub categories 2014-10-09 16:31:19 +02:00
Sacha Froment efd7427e7b // second revert 2014-10-08 18:38:13 +02:00
Sacha Froment c9b150c890 // fix sub thumbnail 2014-10-08 18:21:47 +02:00
Jérôme Nadaud 461c7a197a // Version updated to v2.0.7 2014-10-07 10:13:23 +02:00
Sacha Froment 6d08c207d7 [-] MO : Fix PSCSX-1466 Categorie disapear 2014-10-06 12:24:53 +02:00
Jérôme Nadaud 7a3c782dec // Version updated to v2.0.6 2014-09-26 07:53:56 +02:00
sfroment42 2f5f6159ff // add clear cache 2014-09-24 14:58:33 +02:00
sfroment42 045e4083c3 [-] MO : Fix PSCFV-12556 implementation of reset method 2014-09-24 11:01:53 +02:00
Jérôme Nadaud 56809f52c4 // Version updated to v2.0.5 2014-09-10 14:27:34 +02:00
Thibaud Chauviere 3efef4dafb [*] MO : blocktopmenu - better multishop details display 2014-09-10 11:55:43 +02:00
Thibaud Chauviere 5a06069787 Merge branch 'dev' of https://github.com/PrestaShop/blocktopmenu into dev 2014-09-10 11:53:31 +02:00
Jerome Nadaud 3049a67233 Merge branch 'dev' 2014-09-08 10:30:48 +02:00
Jerome Nadaud 62ffacb0b4 //Version update 2014-09-08 10:30:21 +02:00
Thibaud Chauviere 1de0958501 Merge branch 'master' into dev 2014-09-08 09:41:56 +02:00
Thibaud Chauviere fa8848d7a8 [-] MO : blocktopmenu - Fix htmldecode on link edit 2014-09-08 09:40:13 +02:00
Thibaud Chauviere f61c1a6543 Merge branch 'master' of https://github.com/PrestaShop/blocktopmenu 2014-09-08 09:25:31 +02:00
Jerome Nadaud 17f1775fa7 Merge branch 'dev' 2014-09-08 09:12:06 +02:00
Thibaud Chauviere 60c1c902b4 Merge branch 'dev' 2014-09-03 10:38:27 +02:00
Thibaud Chauviere c3643e223f // Version update to v2.0.3 2014-09-03 10:19:38 +02:00
Thibaud Chauviere 4a2a56f968 // Version update to v2.0.3 2014-09-03 10:19:10 +02:00
Jérôme Nadaud 8f9378de9b // Version updated to v2.0.1 2014-08-23 11:01:21 +02:00
Thibaud Chauviere a83b8e8061 Merge pull request #10 from montes/bugfix_links_labels
[-] MO - blocktopmenu : fixed bug when editing links labels with special caracters
2014-08-22 15:31:32 +02:00
montes 7a56e67fbf [-] MO blocktopmenu : fixed bug when editing links labels with special characters 2014-08-22 15:21:41 +02:00
sfroment42 611623747f Merge branch 'dev' of ssh://github.com/PrestaShop/blocktopmenu into dev 2014-08-22 10:19:33 +02:00
sfroment42 7f49100187 [-] MO : Fix PSCSX-3021 regex can't fail 2014-08-22 10:19:21 +02:00
Jerome Nadaud 3533611d69 Merge branch 'dev' 2014-08-18 11:10:19 +02:00
Jerome Nadaud 61bceabe68 //Version update 2014-08-18 11:09:43 +02:00
Gregory Roussac 826e1b405c Merge pull request #8 from AlexEven/patch-1
// blocktopmenu.php: typo
2014-08-14 17:22:58 +02:00
AlexEven 0b613ae2fb // blocktopmenu.php: typo 2014-08-14 17:14:07 +02:00
Jerome Nadaud 2d553c0668 Merge branch 'dev' 2014-08-13 14:19:35 +02:00