Commit Graph

88 Commits

Author SHA1 Message Date
Jérôme Nadaud d0eafb38e4 Merge pull request #34 from tchauviere/dev
[-] MO: Fix active category check
2015-07-07 10:22:59 +02:00
Thibaud Chauviere e3c2e31e2f [-] MO: Fix active category check 2015-07-07 10:21:05 +02:00
jeromenadaud 6816b775ad // Version updated to v2.2.0 2015-07-01 15:59:07 +02:00
Jérôme Nadaud 612853be96 Merge pull request #31 from tchauviere/feat/admin-hidden-categories-management
Feat/admin hidden categories management
2015-06-26 14:24:43 +02:00
Thibaud Chauviere 52013f8306 // Remove commented debug line 2015-06-26 14:22:37 +02:00
Thibaud Chauviere ac1c1d80fb [*] MO : Blockopmenu can now manage hidden categories without displaying them in the front office 2015-06-26 14:11:07 +02:00
Jérôme Nadaud 15e6d0e7c6 Merge pull request #28 from maximebiloe/nm-410
[-] MO : #NM-410 Avoid empty li when no image
2015-05-18 09:21:00 +02:00
Maxime Biloé 6b65bfa8b6 [-] MO : #NM-410 Avoid empty li when no image 2015-05-15 13:59:28 +02:00
Jérôme Nadaud e81eee45a5 Merge pull request #25 from xsius/dev
[*] MO: blocktopmenu Make private members protected to allow overrides
2015-05-13 11:32:22 +02:00
Jérôme Nadaud 3865343ca3 Merge pull request #27 from PrestaEdit/patch-1
[-] MO: blocktopmenu / protected scope
2015-05-13 07:52:20 +02:00
PrestaEdit 8dac09ea7c [-] MO: blocktopmenu / protected scope 2015-05-12 19:05:14 +02:00
Francois Gaillard b0898e08d2 // Update PrestaShop license headers (2007-2015) 2015-05-11 11:27:57 +02:00
Marius Kiznis 6b26b5fcc2 [*] MO: blocktopmenu Make private members protected to allow overrides 2015-03-27 13:09:42 +02:00
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