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

• fea7cd5983 //helper list must be wrapped by a form even if it's a simple header Vincent Augagneur 2013-10-22 14:48:44 +02:00
• b4499937d8 // Comparison is optionnal Damien Metzger 2013-10-22 14:15:10 +02:00
• a4eeff4cd7 // Shortcuts for chart selection Damien Metzger 2013-10-22 14:07:02 +02:00
• a7c7bc68a3 // Fix products form content Jerome Nadaud 2013-10-22 13:38:47 +02:00
• e857fb5978 [*] FO: Removed missplaced </li> on mobile theme PhpMadman 2013-10-22 13:34:52 +02:00
• c307eb7ece // Date range picker fix Jerome Nadaud 2013-10-22 12:29:17 +02:00
• 1ae587475b [-] MO : Fix bug #PSCFV-10787, cms associated to all shops gRoussac 2013-10-22 12:19:58 +02:00
• a8db1f3030 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-22 12:13:37 +02:00
• b6d6336e26 // Add date subtitle Jerome Nadaud 2013-10-22 12:12:41 +02:00
• 857c66454b // Typo Damien Metzger 2013-10-22 11:47:47 +02:00
• 16cf10d586 // New profitability calculation Damien Metzger 2013-10-22 11:39:38 +02:00
• d8d9436f51 // add date change trigger Jerome Nadaud 2013-10-22 11:35:24 +02:00
• d20aea0563 [-] BO : Fix bug #PSCFV-10767, could not retrieve feature value when product IDs not forced gRoussac 2013-10-22 11:27:45 +02:00
• 73e9d966a6 // list bulk actions fix Jerome Nadaud 2013-10-22 11:24:50 +02:00
• c6997bd525 // move clear cache of color list Rémi Gaillard 2013-10-22 11:09:55 +02:00
• ce8d01ad4c [-] MO : if customer is logged we do not recreate it Gaelle ITZKOVITZ 2013-10-22 11:09:53 +02:00
• 96766a311e // Unify form fields for image preferences Jerome Nadaud 2013-10-22 10:10:15 +02:00
• aa95454c4e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-22 10:07:03 +02:00
• eb82297f45 // small fixs Kevin Granger 2013-10-22 10:04:45 +02:00
• 2aa52356ad [-] BO : Fix bug #PSCFV-10607 one upload name gRoussac 2013-10-22 09:39:59 +02:00
• 3ba337f19a // Image preference bootstraping Jerome Nadaud 2013-10-22 09:25:05 +02:00
• a62f9169d5 //missing file btn-primary => btn btn-default Vincent Augagneur 2013-10-22 09:15:46 +02:00
• 8144935d76 //btn-primary => btn btn-default thanks @Shipow Vincent Augagneur 2013-10-22 09:12:01 +02:00
• 6bc9b54306 //small fix - added new link on block top menu Vincent Augagneur 2013-10-21 22:29:56 +02:00
• fb167d94f9 // Remove duplicate class Jerome Nadaud 2013-10-21 19:13:19 +02:00
• e8f68441db // Assigned shop phone to frontend smarty Damien Metzger 2013-10-21 19:02:13 +02:00
• fadbc4c250 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-21 19:00:18 +02:00
• c89f6c1adb // css fix Kevin Granger 2013-10-21 18:58:23 +02:00
• f336cc599b // Btn-primary replacement Jerome Nadaud 2013-10-21 18:56:41 +02:00
• 766e409476 // Wrong end block position Jerome Nadaud 2013-10-21 18:34:03 +02:00
• bf6c57063c // Fixed dashboard style Damien Metzger 2013-10-21 18:17:07 +02:00
• 58aa64fab7 // Code cleaning Damien Metzger 2013-10-21 18:04:38 +02:00
• 3ae1f68b3b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-21 18:03:15 +02:00
• 2e13013657 // search field WIP Kevin Granger 2013-10-21 18:03:00 +02:00
• d6ad300625 // List pagination improvements Jerome Nadaud 2013-10-21 17:59:48 +02:00
• c1ecf43be8 [-] MO : Fix bug #PSCFV-10775, could not upload .jpeg in TinyMCE gRoussac 2013-10-21 17:39:20 +02:00
• e7b901ce34 // Smaller update notification Damien Metzger 2013-10-21 17:24:20 +02:00
• f0104dc726 // Wait 1s for ajax element close Jerome Nadaud 2013-10-21 17:22:42 +02:00
• 5f75439a6b // Date range picker improvements Jerome Nadaud 2013-10-21 17:07:57 +02:00
• aefa821d7f [*] MO : TM - Blockcart added Layer gRoussac 2013-10-21 16:55:47 +02:00
• 16ffbd8ee5 // norms gRoussac 2013-10-21 16:46:22 +02:00
• 61884ec223 // norms gRoussac 2013-10-21 16:31:56 +02:00
• 3cf5c9968b // Added images to blockmanufacturers Damien Metzger 2013-10-21 15:38:58 +02:00
• a05c748e81 // addJqueryPlugin receives array in first argument gRoussac 2013-10-21 15:05:03 +02:00
• 10473e09ad Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-10-21 14:51:25 +02:00
• 150c6e0130 [+] CORE : helperList action can be rendered from module classe Vincent Augagneur 2013-10-21 14:51:14 +02:00
• a9e45fccf3 [-] MO : ScrollTo not loaded gRoussac 2013-10-21 14:35:23 +02:00
• d25b41ef97 [-] BO : wrong csv files name gRoussac 2013-10-21 14:34:59 +02:00
• 5d8c0a0fc2 duplicateFeatures doesn't protect feature values Samy Rabih 2013-10-21 14:08:30 +02:00
• 7fbf6c7de0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-21 13:45:50 +02:00
• e53e63c257 // Add Back button to list footer Jerome Nadaud 2013-10-21 13:45:39 +02:00
• 8053604005 Update GuestTrackingController.php Daniel 2013-10-21 19:40:47 +08:00
• 7c7fe5dc0b // small change gRoussac 2013-10-21 12:39:48 +02:00
• 53a7b75d7a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-21 12:36:02 +02:00
• 101df4c0b9 // Add check list filters value Jerome Nadaud 2013-10-21 12:35:57 +02:00
• 15cd0b9fbc [-] BO : Report of https://github.com/PrestaShop/PrestaShop/commit/fd86a29c5c369ec5da0f91bbe97c584a00d02d0d gRoussac 2013-10-21 12:21:49 +02:00
• 957f9f0467 // categories group Kevin Granger 2013-10-21 12:21:35 +02:00
• b141975d57 // Fix fields_list check Jerome Nadaud 2013-10-21 11:49:08 +02:00
• 9c4b975cfc //Module uploader bootstraping Jerome Nadaud 2013-10-21 11:31:50 +02:00
• 693a2aa8ff Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-21 11:25:05 +02:00
• 81042db718 // CSV import uploader bootstraping Jerome Nadaud 2013-10-21 11:24:56 +02:00
• 9cf2fe4214 //removed commented code Vincent Augagneur 2013-10-21 10:24:20 +02:00
• 3dea171047 Merge pull request #862 from PhpMadman/patch-3 Gregory Roussac 2013-10-21 01:15:39 -07:00
• 35df3f463c Removed unsed code PhpMadman 2013-10-21 10:10:28 +02:00
• 459d0232a4 //blockcms use boostrap design Vincent Augagneur 2013-10-21 10:08:45 +02:00
• e058224cf2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-10-21 09:58:18 +02:00
• 103582be33 //blocklink now use bootstrap design Vincent Augagneur 2013-10-21 09:58:08 +02:00
• 6275e7bcad // Remove translations on icon class Jerome Nadaud 2013-10-21 09:57:13 +02:00
• a5ca6f11a7 // css email Kevin Granger 2013-10-21 09:51:46 +02:00
• fd86a29c5c //small fix Vincent Augagneur 2013-10-21 09:50:20 +02:00
• 198e75245d [-] FO: Don't auto detect language if it not associated to the shop #PSCFV-10273 Rémi Gaillard 2013-10-21 09:41:00 +02:00
• 8ef22c3548 Merge pull request #823 from kpodemski/patch-8 Gregory Roussac 2013-10-20 16:40:16 -07:00
• 9b8a7edad8 // small refacto gRoussac 2013-10-21 01:05:18 +02:00
• 332c8ff49f [-] CORE : Fix bug #PSCFV-10687 again, #PSCFV-10752 replaceAccentedChars() // sorry for that gRoussac 2013-10-21 00:28:41 +02:00
• c9d20f35b3 // norms gRoussac 2013-10-21 00:00:17 +02:00
• f2d70076bd [-] : Fix bug #PSCFV-4859, could not register invoice address or invoice country in OPC as guest, and phone not required in standard registration gRoussac 2013-10-20 23:52:48 +02:00
• 6633f40a7a // .bak PrestaEdit 2013-10-19 17:21:46 +02:00
• 02029b1006 //ignore .bak J. Danse 2013-10-19 13:11:39 +02:00
• 1f02bcaa75 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-18 19:07:15 +02:00
• 067eecdc70 // small fix Kevin Granger 2013-10-18 19:07:03 +02:00
• cdab5ed6c9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-18 18:47:42 +02:00
• 7e176b157b // Fix save and preview button Jerome Nadaud 2013-10-18 18:44:13 +02:00
• c36625a136 Merge pull request #851 from PrestanceDesign/patch-1 Gregory Roussac 2013-10-18 09:42:57 -07:00
• 04b4e548f3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-18 18:38:17 +02:00
• 5f52a9e171 // fix products Kevin Granger 2013-10-18 18:38:02 +02:00
• 5daa79c1e1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-10-18 18:36:51 +02:00
• 8ef1e043af [*] BO : chmod 664 to config.xml file gRoussac 2013-10-18 18:36:30 +02:00
• d1a2c33322 Merge pull request #849 from djfm/bootstrap Damien Metzger 2013-10-18 09:35:20 -07:00
• 6c37efdb6a // Categories image upload bootstraping Jerome Nadaud 2013-10-18 18:33:32 +02:00
• ff81667b5c // Image thumnail fix Jerome Nadaud 2013-10-18 18:28:57 +02:00
• 667353d43f // Store contacts bootstraping Jerome Nadaud 2013-10-18 18:24:21 +02:00
• 6965bb29c1 [*] BO : Adding a title tag to display the module name on hover like PS 1.4 PrestanceDesign 2013-10-18 18:20:15 +02:00
• 1c1fb5fb5c // Update image fix Jerome Nadaud 2013-10-18 17:59:45 +02:00
• ed2546d07c // Define language dir constant Jerome Nadaud 2013-10-18 17:59:34 +02:00
• 1bee0087c0 // Update image fix Jerome Nadaud 2013-10-18 17:50:36 +02:00
• 72ccc90cc9 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-10-18 17:49:14 +02:00
• 7133e74c17 [-] MO mailalerts: module mailalerts shows all messages regarding the order PNM-1632 - MailAlert does not show Paypal error message if order has comments Fabio Chelly 2013-10-18 17:49:00 +02:00
• 964f546b0b // Update image when updated Jerome Nadaud 2013-10-18 17:41:36 +02:00
• 0599d4f056 // Fix Localization page header title Jerome Nadaud 2013-10-18 17:41:10 +02:00
• 785fe814bc // Define Order state dir constante Jerome Nadaud 2013-10-18 17:40:49 +02:00