Commit Graph

210 Commits

Author SHA1 Message Date
djfm a14cc9be6c Various fixes 2015-09-11 13:59:40 +02:00
djfm 423d36151d Added current page class 2015-09-11 13:01:54 +02:00
djfm 8803938004 Templating & Caching 2015-09-11 11:30:15 +02:00
djfm 247574ab9d // forgot to normalize this node 2015-09-11 10:32:11 +02:00
djfm 2776a38764 // removed cache for now 2015-09-11 10:22:52 +02:00
djfm 4a7db33427 Removed search feature, already handled in own module 2015-09-11 10:13:20 +02:00
djfm c4f5919c0a // first pass, removed resources and made tree object 2015-09-11 09:41:38 +02:00
Francois Gaillard 61c571e9a8 // Update composer.json 2015-08-28 16:59:23 +02:00
Thomas N d2c7e5e8e6 // Version updated to v2.2.3 2015-08-20 14:53:45 +02:00
Jérôme Nadaud 277c6101ef Merge pull request #36 from sfroment42/dev
Follow up of #30 #33
2015-08-04 14:40:00 +02:00
Francois Gaillard 9481474a80 // Add composer.json 2015-07-20 14:10:43 +02:00
Francois Gaillard 5871e0cfc9 // Add composer.json 2015-07-20 11:04:48 +02:00
Jérôme Nadaud 7abda4bf26 // Version updated to v2.2.2 2015-07-15 13:25:17 +02:00
Sacha FROMENT 06ba75fee0 [-] MO : Correct sended parameters
(cherry picked from commit 909b2cf7b4aea51bd8c0f2ea1fe5adf3355fec4e)

Conflicts:
	blocktopmenu.php
2015-07-10 08:52:10 +02:00
NielsH 0d782ed35e [-] MO : Remove duplicate $id_shop parameters
Remove duplicate definition of $id_shop in the getCMSPages() function. PHP7 will not accept this and returns a fatal error upon encountering this.
(cherry picked from commit eadf84b21dd2736669887e8f0c57b2ca38607dfb)

(cherry picked from commit c7ceb52e124b40cc40cdfab336bec16006d14397)

Conflicts:
	blocktopmenu.php
2015-07-09 17:05:22 +02:00
Thibaud Chauviere 4ccc2fbac1 Merge pull request #35 from ZiZuu-store/patch-1
[-] MO : fix generateCategoriesMenu()
2015-07-07 15:40:50 +02:00
ZiZuu.com 8d223fa303 [-] MO : fix generateCategoriesMenu()
A disabled category should be skipped, not made interrupt processing the whole category tree
2015-07-07 15:19:30 +02:00
Thibaud Chauviere 03ba75e1d2 [PSR-2] Fix indentation 2015-07-07 10:48:15 +02:00
Thibaud Chauviere 020524e4e1 [PSR-2] Fix function call spaces 2015-07-07 10:47:13 +02:00
Thibaud Chauviere 39f4d2c053 [PSR-2] Fix EOF ending 2015-07-07 10:46:09 +02:00
Thibaud Chauviere 58fb997a0f [PSR-2] Fix braces 2015-07-07 10:43:46 +02:00
jeromenadaud 8e57f4d429 // Version updated to v2.2.1 2015-07-07 10:25:29 +02:00
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