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

• daa1cc47db Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-09 09:43:10 +02:00
• b4459e39a4 // Orders WIP Kevin Granger 2013-10-09 09:43:04 +02:00
• 57c34488ff // Orders refund buttons Jerome Nadaud 2013-10-09 09:41:51 +02:00
• 5a4548bd51 // Toolbar for search Jerome Nadaud 2013-10-09 09:41:10 +02:00
• fcc2930693 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop gRoussacandJerome Nadaud 2013-09-25 18:41:52 +02:00
• f9373e6178 // Fix toolbar button and toolbar title for invoices Jerome Nadaud 2013-10-09 08:53:36 +02:00
• 60214d8fb6 // nothing Rémi Gaillard 2013-10-08 22:11:28 +02:00
• d9b40b8f35 // Added Modules KPIs Damien Metzger 2013-10-08 19:39:39 +02:00
• 797a6c121a // Orders WIP Kevin Granger 2013-10-08 18:53:41 +02:00
• d595cd2f12 // Toolbar modif for products Jerome Nadaud 2013-10-08 18:51:10 +02:00
• b9cfc24922 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-08 18:42:19 +02:00
• d88857610d // Toolbar modifs Jerome Nadaud 2013-10-08 18:42:07 +02:00
• 008c6ce759 [-] FO : Fix bug #PSCFV-10497 cart_block hooked on column disappearing gRoussac 2013-10-08 18:37:50 +02:00
• 85946bacbe // small cast gRoussac 2013-10-08 18:35:56 +02:00
• f2c6887497 // quickview Rémi Gaillard 2013-10-08 17:44:10 +02:00
• 180a778e51 [*] Installer : replaced radio buttons by a select for the installer language list (too many languages) Damien Metzger 2013-10-08 17:05:15 +02:00
• 0db2372724 // add color list to some controllers Rémi Gaillard 2013-10-08 15:39:06 +02:00
• 53748c3119 // Code cleaning Damien Metzger 2013-10-08 15:01:46 +02:00
• cd8af9ae67 Merge pull request #824 from Prestaworks/patch-14 Gregory Roussac 2013-10-08 05:57:21 -07:00
• fa88a0bd93 Update AdminTranslationsController.php Daniel 2013-10-08 20:54:52 +08:00
• 2899dfba5e // Fix AdminTranslationsController::addNewTabs() Rémi Gaillard 2013-10-08 14:53:02 +02:00
• c75cb99b51 // Code cleaning Damien Metzger 2013-10-08 14:45:11 +02:00
• a14118863e // Code cleaning Damien Metzger 2013-10-08 14:27:44 +02:00
• 3e6f425bd4 // Orders WIP Kevin Granger 2013-10-08 12:26:48 +02:00
• b7e13e2e7f // Code cleaning Damien Metzger 2013-10-08 11:54:57 +02:00
• ae7d33effe [*] CORE: Add phone_mobile to address format Krystian Podemski 2013-10-08 11:11:24 +02:00
• e4a642128a [-] FO : Fix bug #PSCFV-10606 could not have correct taxCalculationMethod when vat number in customer address gRoussac 2013-10-08 11:09:52 +02:00
• 30adb0932d [-] BO : pass correct typed parameter to setCurrency Zollner Robert 2013-10-07 23:42:26 +03:00
• 7d0e9a5f06 // Fix double entities on AdminLog listing #PSCFV-10472 Rémi Gaillard 2013-10-07 19:37:58 +02:00
• 4daaa206d2 Merge pull request #818 from cedricfontaine/patch-2 Gregory Roussac 2013-10-07 09:55:35 -07:00
• 3e2d2e2afc // fix Orders Kevin Granger 2013-10-07 18:54:28 +02:00
• 644e38c05f Merge pull request #817 from cedricfontaine/patch-1 Gregory Roussac 2013-10-07 09:54:22 -07:00
• 77b2b4b6ca // Manual merge PS 1.5.6.0 Francois Gaillard 2013-10-07 18:22:55 +02:00
• d63288affd Update loyalty.php cedricfontaine 2013-10-07 12:14:13 -04:00
• c51fe5b22d // Changelog 1.5.6.0 1.5.6.0 Damien Metzger 2013-10-07 18:07:25 +02:00
• 717e195f57 Update LoyaltyModule.php cedricfontaine 2013-10-07 12:07:03 -04:00
• f78a093a1c Merge pull request #815 from PrestanceDesign/development Gregory Roussac 2013-10-07 08:39:39 -07:00
• 8f1b19a30b // update customer service page Sarah Lorenzini 2013-10-07 16:44:42 +02:00
• f9f5a4b090 Italian translation of the country instead of English PrestanceDesign 2013-10-07 16:45:22 +02:00
• e94a32f80e // Localization Countries edit bootstraped Jerome Nadaud 2013-10-07 14:50:57 +02:00
• 6f2358a0da // Manufacturer view bootstraped Jerome Nadaud 2013-10-07 14:16:41 +02:00
• 2c4a20e21a // Add form group to referer view form items Jerome Nadaud 2013-10-07 13:44:04 +02:00
• efb041b747 // New referer Bootstraped Jerome Nadaud 2013-10-07 13:40:36 +02:00
• 483aa8ad7d // Add block name fieldset and input_row Jerome Nadaud 2013-10-07 13:34:35 +02:00
• 92ffb1eab1 Merge pull request #812 from djfm/release Gregory Roussac 2013-10-07 03:25:42 -07:00
• f4610c06e0 [-] BO : Bug fix - Modules confirmation messages Francois Gaillard 2013-10-07 12:18:44 +02:00
• 68cba08303 [-] BO : Bug fix - Modules confirmation messages Francois Gaillard 2013-10-07 12:18:44 +02:00
• 2969a7f74c // updated Russian installer djfm 2013-10-07 10:14:43 +00:00
• 1ed26e2d4e // default perms profiles Rémi Gaillard 2013-10-07 12:13:59 +02:00
• 302260539b // Report from https://github.com/Lupul/PrestaShop/commit/ebf09792e95598c30d8ac2617c4eabdd571be475 gRoussac 2013-10-07 12:08:39 +02:00
• d125ca0a36 [-] FO : isVirtualCart was forced to false gRoussac 2013-10-07 12:02:47 +02:00
• 8c67235c2e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-07 12:03:43 +02:00
• 6fc12968b8 // Fix missing module configuration bar #PSCSX-3 Jerome Nadaud 2013-10-07 12:03:37 +02:00
• 97824b2335 // License Jerome Nadaud 2013-10-07 12:02:51 +02:00
• adb1779764 [-] FO : isVirtualCart was forced to false gRoussac 2013-10-07 12:02:47 +02:00
• 900209f93c // bad commit https://github.com/PrestaShop/PrestaShop/commit/c2bcc5baa1e6dd73f46a0811bf8889b80bcdc982 gRoussac 2013-10-07 11:44:09 +02:00
• a652590885 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-10-07 11:34:56 +02:00
• 2515d81bdd [*] BO Module search: Quick search can now search modules by name and not only display name Fabio Chelly 2013-10-07 11:34:16 +02:00
• bf65404413 Merge pull request #810 from studiokiwik/sk-ps15x-001 Gregory Roussac 2013-10-07 02:29:19 -07:00
• e3db5570d0 [-] BO : Retro compat, PS_ADMIN_DIR not defined //bad commit sorry gRoussac 2013-10-07 11:24:42 +02:00
• 2c3bf85ca7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-07 11:12:59 +02:00
• ba7d9eec21 // fix Orders Kevin Granger 2013-10-07 11:11:21 +02:00
• 9b79a02e88 // Remove unused function Jerome Nadaud 2013-10-07 11:03:42 +02:00
• a1f5455d07 // Fix Mark as favorite not updated Jerome Nadaud 2013-10-07 11:03:03 +02:00
• 68131dc28b Merge pull request #811 from studiokiwik/sk-ps15x-002 Gregory Roussac 2013-10-07 01:59:10 -07:00
• 7a7da1097d [-] BO : Employee's default_tab may not exists, switching to AdminOrders gRoussac 2013-10-07 10:53:03 +02:00
• df0a24d63c [-] BO : Retro compat, PS_ADMIN_DIR not defined gRoussac 2013-10-07 10:47:41 +02:00
• 46fef35348 //homefeatured now use bootstrap design Vincent Augagneur 2013-10-07 10:25:10 +02:00
• 4254ae6edc typo fixed in polish installer translation (line 85) Tomasz Slominski 2013-10-07 10:05:43 +02:00
• 3f4f298ad4 [-] CORE fixed bug #PSCFV-10595 - small fix in function addJqueryPlugin() Vincent Augagneur 2013-10-07 10:01:26 +02:00
• 2a475d066f Merge pull request #803 from ldecoker/patch-8 Gregory Roussac 2013-10-07 01:00:42 -07:00
• b941ac007b bugfix: button tag on line 56 weren't closed Tomasz Slominski 2013-10-07 09:57:55 +02:00
• d6ffb45eb1 Merge pull request #809 from djfm/kill_miss Damien Metzger 2013-10-07 00:57:13 -07:00
• b6bba0c787 [*] LO : Removed 'Miss' from the default genders because too country specific djfm 2013-10-07 07:53:19 +00:00
• 3477cac1e0 Merge pull request #800 from Ha99y/20131004_retro-compat.js.php Rémi Gaillard 2013-10-07 00:35:02 -07:00
• 5c605067f0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-10-07 09:09:26 +02:00
• 8a6dc6233d //jquery.smartWizard use bootstrap css classes Vincent Augagneur 2013-10-07 09:08:20 +02:00
• d3d0897012 [-] MO : productcomments round average up not down indesign47 2013-10-07 04:02:42 +02:00
• e0978a0b84 [-] MO : productcomments errors translated in multi-language indesign47 2013-10-07 03:18:56 +02:00
• 148348855e Update OrderDetailController.php ldecoker 2013-10-06 16:31:54 +02:00
• b61e3e68b9 Update AdminImportController.php indesign47 2013-10-05 10:50:19 +02:00
• 98aea24fc3 __DIR__ was never defined ha99y 2013-10-04 17:18:23 -07:00
• 1787923c4c [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency (changed NULL to lowercase) Zollner Robert 2013-10-05 00:42:29 +03:00
• 481cb5c28a [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency Zollner Robert 2013-10-04 23:30:24 +03:00
• 2ab3f08eab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-04 19:13:13 +02:00
• c2ea0be841 // orders WIP Kevin Granger 2013-10-04 19:13:02 +02:00
• b2b0c4f00b // remove debug Rémi Gaillard 2013-10-04 18:45:18 +02:00
• 2aee99c0b0 [-] FO: Fix display of quantity discounts on product pages if the customer is allowable for multiple discount for the same quantity #PSCFV-10580 Rémi Gaillard 2013-10-04 18:37:30 +02:00
• d141f5bdc0 // wrong modif on ProductSale gRoussac 2013-10-04 18:35:30 +02:00
• c2bcc5baa1 [*] FO : TM home modules preparation gRoussac 2013-10-04 18:32:31 +02:00
• 48f20a4393 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-10-04 18:15:32 +02:00
• 139a74e4cd [*] BO Module search: the PHP search has been replace by a quick search in JS to display results instantly Fabio Chelly 2013-10-04 18:15:12 +02:00
• 2e4f5c0b07 // Menus details list is now bootstraped Jerome Nadaud 2013-10-04 17:34:07 +02:00
• 337725bb86 // Fixed KPI with 0 value Damien Metzger 2013-10-04 17:27:51 +02:00
• 5564b342f4 //wizard boostrap and title fix Vincent Augagneur 2013-10-04 17:07:10 +02:00
• 121fcdc39f // Fix list start Jerome Nadaud 2013-10-04 16:56:35 +02:00
• fe6494bf35 //fixed bug PSCFV-10567 Vincent Augagneur 2013-10-04 16:33:50 +02:00
• 828b838d22 //products comparison link Vincent Augagneur 2013-10-04 16:25:47 +02:00
• 5557ac1aee // Remove attribute language desc from stock movement list when product attribute is removed Jerome Nadaud 2013-10-04 15:30:27 +02:00
• 5c5a989cda // Added javascript validation functions (demo) Damien Metzger 2013-10-04 15:24:39 +02:00