Commit Graph
20926 Commits
Author SHA1 Message Date
Vincent Augagneur 4b4622a1c7 //blocknewsletter now use boostrap design 2013-09-20 16:52:48 +02:00
Vincent Augagneur b7045b998a //blocknewproducts now use boostrap design 2013-09-20 16:41:31 +02:00
Jerome Nadaud e9cd8ac145 // Search tree toolbar button 2013-09-20 16:20:27 +02:00
Jerome Nadaud f44ecb9fc8 // Products section list adjustment 2013-09-20 16:19:50 +02:00
Rémi Gaillard 7aa348eb93 // bad char 2013-09-20 15:48:22 +02:00
Jerome Nadaud caa1dbc7ea //Fix tree search toolbar button design 2013-09-20 15:39:44 +02:00
Jerome Nadaud f51ffe4c55 // Start design of multistore toolbar 2013-09-20 15:30:59 +02:00
gRoussac e2a1f5101c [-] BO : Bad input radio names 2013-09-20 15:27:31 +02:00
gRoussac 7d05da1618 [-] IN : Lower by two flush limit in migrate_orders 2013-09-20 15:12:57 +02:00
gRoussac 429c9442a3 [*] CORE : bad else if in getTemplatePath 2013-09-20 15:10:14 +02:00
Jerome Nadaud f312a055b1 // Multistore bootstrap design 2013-09-20 15:04:43 +02:00
Vincent Augagneur 2f3d736f13 //blockmanufacturer is now using bootstrap design 2013-09-20 14:56:41 +02:00
Kevin Granger eeb3b540e2 // orders + css highlight / fixed-width 2013-09-20 14:42:09 +02:00
Rémi Gaillard 2dc91758c3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-20 14:12:56 +02:00
Rémi Gaillard 9b878a33a8 // fix canonical and ssl page without ssl 2013-09-20 14:12:41 +02:00
Damien Metzger fc42ce17b8 // Set default option for the menu in the installer 2013-09-20 14:08:26 +02:00
Damien Metzger 7eb3b22829 [-] Installer : added the missing default tab in the employee 2013-09-20 14:06:38 +02:00
vAugagneur aef0897436 //blockcustomerprivacy now use bootstrap design 2013-09-20 13:22:35 +02:00
vAugagneur 23ecca163d //blockcontactinfos is now using bootstrap design 2013-09-20 11:46:02 +02:00
vAugagneur 4c5cd50345 /small fix 2013-09-20 11:38:39 +02:00
Rémi Gaillard e2ac223f4e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-20 11:34:54 +02:00
Rémi Gaillard 5b7580d487 [-] MO: Fix time of smarty cache invalidation 2013-09-20 11:33:30 +02:00
vAugagneur 2f56a4dbbd //blockcontact is now using bootstrap design 2013-09-20 11:31:12 +02:00
vAugagneur c7ebf5ba5d //blockcart is now using bootstrap design 2013-09-20 11:24:16 +02:00
vAugagneur 07c03ecf6d //blockcategories is now using bootstrap design 2013-09-20 11:18:30 +02:00
Damien Metzger 1cebd5920e [*] Installer : added file check in order to check if everyhting has been successfuly uploaded 2013-09-20 11:09:22 +02:00
Kevin Granger 76bf61c20a //fix double desc 2013-09-20 11:04:41 +02:00
Fabio Chelly 4f639329e9 Merge remote-tracking branch 'origin/development' into development 2013-09-20 10:47:17 +02:00
Fabio Chelly 91ae972655 [-] MO mailalert : products alerts can be registered for multiple guests
#PNM-1669
2013-09-20 10:46:56 +02:00
Jerome Nadaud 74a262f2ed // Shopping carts bootsrap design 2013-09-20 10:29:32 +02:00
Damien Metzger f8ca06d927 // Better cache depth management for smarty 2013-09-20 10:26:58 +02:00
Damien Metzger eb6600e840 // Blockcustomerprivacy should not be installed by default 2013-09-20 10:26:58 +02:00
Gregory Roussac 14cd72121a Merge pull request #732 from Ha99y/20130919_X-Robots
[*] CORE : Send noindex header to avoid ghost carts by bots
2013-09-20 00:52:49 -07:00
ha99y 42cdc988ac Send noindex header to avoid ghost carts by bots 2013-09-19 22:15:00 -07:00
Kevin Granger 724ab12122 // orders cleanup 2013-09-19 20:12:05 +02:00
Jerome Nadaud 660bb870cc // Add tooltip to list header toolbar button 2013-09-19 19:45:21 +02:00
Jerome Nadaud c0fa5f8f79 // Fix hint in options.tpl 2013-09-19 19:39:46 +02:00
Jerome Nadaud 39edb5a546 // Fix cart rules bootstrap design 2013-09-19 19:33:55 +02:00
Jerome Nadaud 9b308ae7fc // Fix Translatable field on cart rule information 2013-09-19 19:01:43 +02:00
Jerome Nadaud e1a3440145 // Add array for hint and desc for options.tpl 2013-09-19 18:56:35 +02:00
Jerome Nadaud b40b9ec328 // Fix Permissions 2013-09-19 18:26:42 +02:00
Jerome Nadaud e6780f7a86 // Fix menu list position col 2013-09-19 18:08:20 +02:00
Jerome Nadaud f8fed30b44 // Prevent enter key event propagation for search input 2013-09-19 18:07:50 +02:00
Damien Metzger 33405ed858 // Rollback file wrongly modified by previous commit 2013-09-19 17:57:29 +02:00
Damien Metzger cda7b225e2 // Removed deprecated module 2013-09-19 17:57:29 +02:00
Jerome Nadaud 2e80f00ba2 // Remove console log 2013-09-19 17:39:11 +02:00
Jerome Nadaud 48d7e43f1c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-19 17:38:19 +02:00
Jerome Nadaud 6f483a87a9 // Fix hide language on ajax load 2013-09-19 17:38:07 +02:00
Sarah Lorenzini 550f6c190b // update stats tabs 2013-09-19 17:36:27 +02:00
Francois Gaillard 8c6aaa3c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-19 17:31:42 +02:00