Commit Graph

20246 Commits

Author SHA1 Message Date
fram 1dd0064cb2 // fixed typo in Russian installer 2013-11-18 15:34:46 +01:00
Rémi Gaillard f4194bedd9 Merge pull request #978 from StanProg/bootstrap
// FO : Removed unused local variable, tabs added, phpdoc tags
2013-11-18 06:27:46 -08:00
Rémi Gaillard 4c51570b34 Merge pull request #991 from TMMeilleur/bootstrap
// fixed add to wishlist/compare buttons and added product review
2013-11-18 06:22:43 -08:00
Jerome Nadaud c4dab5f5a6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 15:04:44 +01:00
Jerome Nadaud 40204ba458 // Live configurator toolbox part 2 2013-11-18 15:04:10 +01:00
Damien Metzger adcc4f2c74 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 14:54:47 +01:00
Damien Metzger b4385c346f [+] Installer : new demo products (part 1) 2013-11-18 14:53:39 +01:00
TMMeilleur 95b9710eda fixed add to wishlist/compare buttons and added product review 2013-11-18 15:52:39 +02:00
Jerome Nadaud 2ba5dc18fd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
2013-11-18 14:49:27 +01:00
Jerome Nadaud 46dc93fd7e // Adding update button on to page header toolbar on module 2013-11-18 14:41:49 +01:00
Jerome Nadaud 867eef79cc // Add live configurator toolbox - Part 1 2013-11-18 14:39:46 +01:00
Jerome Nadaud 239604b70c // Missing isset on cols and rows 2013-11-18 14:35:15 +01:00
Jerome Nadaud ebad56a800 // Fix small error 2013-11-18 14:29:32 +01:00
Damien Metzger 89c65536d7 // Added missing configuration vars in the installer 2013-11-18 12:23:50 +01:00
Damien Metzger 5ef4b8eddc // Installer optimization 2013-11-18 12:12:14 +01:00
rGaillard 68c8e9da57 // move to themeconfigurator 2013-11-16 19:24:03 +01:00
Jérôme Nadaud de9e6d72c8 // Typo 2013-11-16 08:04:59 +01:00
Jérôme Nadaud 3a58cb2a91 Merge pull request #983 from PrestaEdit/patch-60
//typo
2013-11-15 22:13:22 -08:00
PrestaEdit 9b787c454f //typo 2013-11-16 01:21:56 +01:00
rGaillard 8c3eb9b9a4 // typo 2013-11-15 21:03:17 +01:00
Damien Metzger b62952accf [*] BO : Added simulation mode to the dashboard 2013-11-15 18:07:23 +01:00
Rémi Gaillard 4bd7164507 Merge pull request #982 from TMMeilleur/bootstrap
// added responsive rich menu and small fix in blockbanner
2013-11-15 08:47:58 -08:00
TMMeilleur a5d9daff13 added responsive rich menu and small fix in blockbanner 2013-11-15 18:40:17 +02:00
Jerome Nadaud 5106a5f1e3 // Fix products controller title 2013-11-15 17:25:12 +01:00
Jerome Nadaud 96def5033f // typo 2013-11-15 17:19:12 +01:00
Jerome Nadaud 8cd1d623e5 // Fix error if default blockbanner image is missing 2013-11-15 17:13:50 +01:00
Jerome Nadaud 19cfa443d2 // fix dashgoals configuration fields size 2013-11-15 17:04:55 +01:00
Jerome Nadaud 5fb4ac5044 // Fix missing last actions button in tracking controller list 2013-11-15 16:25:31 +01:00
Jerome Nadaud 8d90578cf7 // Add anchor to list 2013-11-15 16:04:27 +01:00
Jerome Nadaud ece4331622 //Fix addsharethis error 2013-11-15 15:38:51 +01:00
Jerome Nadaud 3af7a59caa // Add version number to addsharethis 2013-11-15 15:32:52 +01:00
Jerome Nadaud b5d84a72e0 // AddShareThis fix 2013-11-15 15:31:01 +01:00
Jerome Nadaud 44f89053e4 // Invoice search fix 2013-11-15 15:00:56 +01:00
Jerome Nadaud 9fa2299c6b // Open prestashop.com link in new window 2013-11-15 11:56:23 +01:00
Jerome Nadaud d7de507f42 // Product comments 2013-11-15 11:49:40 +01:00
Jerome Nadaud a66d2e1ab6 // Fix form name 2013-11-15 09:18:41 +01:00
Jerome Nadaud c2d956ec7d // Modif after specs change 2013-11-15 08:58:30 +01:00
Jerome Nadaud 29f65da5ca // Add wish list button to blockwishlist module 2013-11-14 19:54:28 +01:00
Rémi Gaillard 7fcbf8aa7c Merge pull request #977 from TMMeilleur/bootstrap
//updates and fixes 14.11.2013
2013-11-14 10:28:06 -08:00
Jerome Nadaud 80957666cf // Hide collapse and expand button when not necessary 2013-11-14 19:21:31 +01:00
Stanislav Yordanov c5b1834870 [*] FO : Removed unused local variable, phpdoc return tag added 2013-11-14 19:22:39 +02:00
TMMeilleur 0d1c113be1 updates and fixes 14.11.2013 2013-11-14 18:08:05 +02:00
Jerome Nadaud 051ed32133 // Add toggle to datepicker button 2013-11-14 16:05:58 +01:00
Jerome Nadaud 4a46960112 // Small bootstrap fix 2013-11-14 16:00:22 +01:00
Jerome Nadaud 18a2e026ef // Adding more buttons to module configuration 2013-11-14 15:49:17 +01:00
Stanislav Yordanov e7e514dc77 Removed unused local variable, tab added, phpdoc tags fixed 2013-11-14 16:41:08 +02:00
Jerome Nadaud 8f81af0463 // fix on blockcategories 2013-11-14 15:12:08 +01:00
Jerome Nadaud 67eeae0fa2 // Set visibility on help button 2013-11-14 14:42:35 +01:00
Jerome Nadaud 299a8e9e9f // Update attributes group title 2013-11-14 14:13:28 +01:00
Jerome Nadaud 09b908204b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-14 11:52:34 +01:00