Commit Graph

Select branches

Hide Pull Requests

1.5

1.6

bootstrap

carrierwizard

development

export_excel

ignore_stock_without_combination

master

patch-1

1.5.0.0

1.5.0.1

1.5.0.13

1.5.0.15

1.5.0.17

1.5.0.2

1.5.0.3

1.5.0.5

1.5.0.9

1.5.1.0

1.5.2.0

1.5.3.0

1.5.3.1

1.5.4.0

1.5.4.1

1.5.5.0

1.5.6.0

1.5.6.1

1.6.0.1

Mono Color

• fc42ce17b8 // Set default option for the menu in the installer Damien Metzger 2013-09-20 14:08:08 +02:00
• 7eb3b22829 [-] Installer : added the missing default tab in the employee Damien Metzger 2013-09-20 14:06:23 +02:00
• aef0897436 //blockcustomerprivacy now use bootstrap design vAugagneur 2013-09-20 13:22:35 +02:00
• 23ecca163d //blockcontactinfos is now using bootstrap design vAugagneur 2013-09-20 11:46:02 +02:00
• 4c5cd50345 /small fix vAugagneur 2013-09-20 11:38:39 +02:00
• e2ac223f4e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-09-20 11:34:54 +02:00
• 5b7580d487 [-] MO: Fix time of smarty cache invalidation Rémi Gaillard 2013-09-20 11:33:30 +02:00
• 2f56a4dbbd //blockcontact is now using bootstrap design vAugagneur 2013-09-20 11:31:12 +02:00
• c7ebf5ba5d //blockcart is now using bootstrap design vAugagneur 2013-09-20 11:24:16 +02:00
• 07c03ecf6d //blockcategories is now using bootstrap design vAugagneur 2013-09-20 11:18:30 +02:00
• 1cebd5920e [*] Installer : added file check in order to check if everyhting has been successfuly uploaded Damien Metzger 2013-09-20 11:09:06 +02:00
• 76bf61c20a //fix double desc Kevin Granger 2013-09-20 11:04:41 +02:00
• 4f639329e9 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-09-20 10:47:17 +02:00
• 91ae972655 [-] MO mailalert : products alerts can be registered for multiple guests #PNM-1669 Fabio Chelly 2013-09-20 10:46:56 +02:00
• 74a262f2ed // Shopping carts bootsrap design Jerome Nadaud 2013-09-20 10:29:32 +02:00
• f8ca06d927 // Better cache depth management for smarty Damien Metzger 2013-09-20 10:26:43 +02:00
• eb6600e840 // Blockcustomerprivacy should not be installed by default Damien Metzger 2013-09-19 09:36:10 +02:00
• 14cd72121a Merge pull request #732 from Ha99y/20130919_X-Robots Gregory Roussac 2013-09-20 00:52:49 -07:00
• 42cdc988ac Send noindex header to avoid ghost carts by bots ha99y 2013-09-19 22:15:00 -07:00
• 724ab12122 // orders cleanup Kevin Granger 2013-09-19 20:12:05 +02:00
• 660bb870cc // Add tooltip to list header toolbar button Jerome Nadaud 2013-09-19 19:45:21 +02:00
• c0fa5f8f79 // Fix hint in options.tpl Jerome Nadaud 2013-09-19 19:39:46 +02:00
• 39edb5a546 // Fix cart rules bootstrap design Jerome Nadaud 2013-09-19 19:33:55 +02:00
• 9b308ae7fc // Fix Translatable field on cart rule information Jerome Nadaud 2013-09-19 19:01:43 +02:00
• e1a3440145 // Add array for hint and desc for options.tpl Jerome Nadaud 2013-09-19 18:56:35 +02:00
• b40b9ec328 // Fix Permissions Jerome Nadaud 2013-09-19 18:26:42 +02:00
• e6780f7a86 // Fix menu list position col Jerome Nadaud 2013-09-19 18:08:20 +02:00
• f8fed30b44 // Prevent enter key event propagation for search input Jerome Nadaud 2013-09-19 18:07:50 +02:00
• 33405ed858 // Rollback file wrongly modified by previous commit Damien Metzger 2013-09-19 17:57:16 +02:00
• cda7b225e2 // Removed deprecated module Damien Metzger 2013-09-19 15:04:48 +02:00
• 2e80f00ba2 // Remove console log Jerome Nadaud 2013-09-19 17:39:11 +02:00
• 48d7e43f1c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-09-19 17:38:19 +02:00
• 6f483a87a9 // Fix hide language on ajax load Jerome Nadaud 2013-09-19 17:38:07 +02:00
• 550f6c190b // update stats tabs Sarah Lorenzini 2013-09-19 17:35:29 +02:00
• 8c6aaa3c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-09-19 17:31:42 +02:00
• 63f4743134 [-] MO : PNM-1715 - Bug fix accented chars & ajax-cart Francois Gaillard 2013-09-19 17:31:35 +02:00
• e0b59082f9 [-] BO : Issue with domready on adminImport gRoussac 2013-09-19 17:19:51 +02:00
• 97cff2210f //removed unused code Vincent Augagneur 2013-09-19 17:01:20 +02:00
• 53e046c4b5 //removed unused code Vincent Augagneur 2013-09-19 17:00:50 +02:00
• 0361d5db8d [-] BO : do not reaffect import_type for categories gRoussac 2013-09-19 16:59:04 +02:00
• f222bb7b7f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-09-19 16:58:12 +02:00
• 650001024a // orders cleanup Kevin Granger 2013-09-19 16:55:06 +02:00
• 2b2b502ba2 //blockbestsellers && bankwire now use displayError & displayConfirmation Vincent Augagneur 2013-09-19 16:55:04 +02:00
• 150b68b96b //displayError & displayConfirmation use bootstrap design Vincent Augagneur 2013-09-19 16:52:58 +02:00
• a5642d43a3 //blockbestsellers module configuration is now using bootstrap design Vincent Augagneur 2013-09-19 16:47:51 +02:00
• ef063db2f0 //bankwire module configuration is now using bootstrap design Vincent Augagneur 2013-09-19 16:39:22 +02:00
• ea6ea955bb // licence gRoussac 2013-09-19 16:39:21 +02:00
• 803b6ce8ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-09-19 16:38:01 +02:00
• 0c511dead5 [*] FIX #PSCFV-8106 do not regenerate thumbnails if not gRoussac 2013-09-19 16:28:19 +02:00
• 33943ef66a // Date range filter Jerome Nadaud 2013-09-19 16:23:26 +02:00
• d1a35838cf //small fix Vincent Augagneur 2013-09-19 16:09:53 +02:00
• 3b465111b9 // Customer group Jerome Nadaud 2013-09-19 15:57:28 +02:00
• 15622fbf45 // Customers group Jerome Nadaud 2013-09-19 14:25:17 +02:00
• cd627113b6 // Some fix Jerome Nadaud 2013-09-19 12:13:24 +02:00
• d735496159 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-09-19 12:09:34 +02:00
• be8f728b2a // orders Kevin Granger 2013-09-19 12:09:25 +02:00
• eb1531a0b3 // Fix textlang size and textarea input group Jerome Nadaud 2013-09-19 11:23:09 +02:00
• c23f01cdc8 // Attributes Groups view Jerome Nadaud 2013-09-19 10:48:16 +02:00
• 6b47f5713e // another fix for multishop fields in context all on product page Rémi Gaillard 2013-09-19 09:48:46 +02:00
• 5eb4c93b8c [-] BO: Bad id for multishop checkbox on admin products - weird bug with active flag #PSCFV-9935 Rémi Gaillard 2013-09-18 19:35:56 +02:00
• 0a9f425281 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development djfm 2013-09-18 16:08:44 +00:00
• 65559c5cf4 // small improvement to Brazilian translations djfm 2013-09-18 16:08:23 +00:00
• e7286c44f2 // typo Rémi Gaillard 2013-09-18 18:08:22 +02:00
• 4e1d6de9b0 [-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated gRoussac 2013-09-18 17:57:00 +02:00
• 5621a3b039 // update tabs stats Sarah Lorenzini 2013-09-18 17:46:49 +02:00
• 154658befd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-09-18 17:41:06 +02:00
• 5bed29a538 // Fix Employees fields Jerome Nadaud 2013-09-18 17:40:46 +02:00
• 6e0be0c226 Dashboard - Fixed last day trend Francois Gaillard 2013-09-18 17:28:04 +02:00
• 75a9629b8a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-09-18 17:23:23 +02:00
• 38d565110f // List header fix Jerome Nadaud 2013-09-18 17:23:22 +02:00
• 27f14b9a31 [-] BO : Fix proces and save buttons for Modules and AdminControllers gRoussac 2013-09-18 17:23:08 +02:00
• 70d48d0af1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-09-18 17:19:18 +02:00
• f6dc81d0f1 // small fix for SSL Rémi Gaillard 2013-09-18 17:19:03 +02:00
• ac1b9fd96e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-09-18 17:10:59 +02:00
• 806e628997 // dashboard update version Kevin Granger 2013-09-18 17:10:48 +02:00
• 4413d04525 // Customer fix Jerome Nadaud 2013-09-18 17:05:16 +02:00
• 2e311410b2 [*] BO : Set import entity in cookie (#PSCFV-8214) gRoussac 2013-09-18 17:02:00 +02:00
• 64f1ba1e08 // Parameters fix Jerome Nadaud 2013-09-18 16:36:33 +02:00
• 0452979ce7 [*] FO: Allow to enable SSL on all the pages Rémi Gaillard 2013-09-18 16:30:34 +02:00
• 1f3e717eb6 // Preferences - Admin bootstrap fix Jerome Nadaud 2013-09-18 16:22:05 +02:00
• 3aec242600 [-] MO : Editorial could not delete image gRoussac 2013-09-18 16:16:36 +02:00
• 93aae26269 [-] Bo : Modules 'save' button not active gRoussac 2013-09-18 15:41:30 +02:00
• 0683ed4092 // Some list design fix Jerome Nadaud 2013-09-18 15:25:58 +02:00
• 39fdc8c926 [+] BO : Added new class ConfigurationKPI for KPI cache storage Damien Metzger 2013-09-18 15:08:53 +02:00
• f293562ea4 [-] BO : Fix bug #PSCFV-8214 import entity pre selected gRoussac 2013-09-18 15:03:16 +02:00
• b71b594ca1 // fix tree search / title / manufacturers Kevin Granger 2013-09-18 15:00:10 +02:00
• 66f46eee03 // Avoid exception if amount is null on addind an orderpayment Rémi Gaillard 2013-09-18 14:29:01 +02:00
• 8a4b24f45e // Added KPIs in products and categories Damien Metzger 2013-09-18 13:49:29 +02:00
• 672da852c5 [-] BO - fixed bug #PSCFV-10178 Vincent Augagneur 2013-09-18 11:40:58 +02:00
• 965b8a1bf3 [-] BO - fixed bug #PSCFV-10286 - End range in summary of shipping wizard not correct when range number is a float Vincent Augagneur 2013-09-18 11:18:26 +02:00
• c48f4f5e1b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-09-18 10:44:19 +02:00
• 5a206e83a8 // Security Jerome Nadaud 2013-09-18 10:43:58 +02:00
• 50a9e7ef99 // Code cleaning Damien Metzger 2013-09-18 10:29:07 +02:00
• 897f1eafeb //Suppliers view Jerome Nadaud 2013-09-18 10:29:04 +02:00
• 8081acb0b5 // Supliers view Jerome Nadaud 2013-09-18 10:09:45 +02:00
• bdb797a66c // update tabs stats Sarah Lorenzini 2013-09-17 17:48:43 +02:00
• 8f10a0e32f // Product customization Jerome Nadaud 2013-09-17 17:30:23 +02:00
• 51663f972e // fix scenes Kevin Granger 2013-09-17 17:15:40 +02:00
• 0971750f9f // Attribute generator to bootstrap Jerome Nadaud 2013-09-17 16:36:54 +02:00
• 47c5f400ee // Add gender on order view Rémi Gaillard 2013-09-17 16:30:47 +02:00