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

• 0603c54756 [*] LO : New English E-Mail templates by SuperSarah djfm 2013-10-24 14:14:29 +00:00
• 3f11dde2f6 Merge pull request #886 from djfm/bootstrap Gregory Roussac 2013-10-24 07:09:10 -07:00
• 572f7c725d // small html fix djfm 2013-10-24 14:04:50 +00:00
• 3e8330dcb3 // small fixes on php email templates djfm 2013-10-24 13:58:14 +00:00
• f0ed5a303c [*] BO : AdminImport add img suppliers indesign47 2013-10-24 15:49:56 +02:00
• 4803530eed [*] BO : AdminImport add img manufacturers indesign47 2013-10-24 15:47:31 +02:00
• ea8a5277f2 [*] BO : AdminImport add img manufacturers-suppliers indesign47 2013-10-24 15:44:11 +02:00
• 667647f891 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Rémi Gaillard 2013-10-24 15:23:25 +02:00
• 691e45a168 // delete useless file Rémi Gaillard 2013-10-24 15:23:03 +02:00
• 6a2e847970 // dashboard improvements Damien Metzger 2013-10-24 15:04:06 +02:00
• a9f75a02a7 // Added missing icons for modules Damien Metzger 2013-10-24 14:15:44 +02:00
• a1df97776a // Set default values Damien Metzger 2013-10-24 13:54:39 +02:00
• 2ffc296279 FO : https://github.com/PrestaShop/PrestaShop/pull/878 gRoussac 2013-10-24 12:03:33 +02:00
• 971722a13f // note updated by ajax in admincustomers should be url encoded Rémi Gaillard 2013-10-24 11:51:48 +02:00
• 4bfd8dee11 // note updated by ajax in admincustomers should be url encoded Rémi Gaillard 2013-10-24 11:51:48 +02:00
• dd6aa1a077 Merge pull request #881 from emilien-puget/bootstrap Damien Metzger 2013-10-24 02:49:34 -07:00
• fc9b39968b // remove notice gRoussac 2013-10-24 11:46:09 +02:00
• 92c2f6953f changed path from dirname(__FILE__) to PS_ROOT_DIR emilien-puget 2013-10-24 11:44:52 +02:00
• a34784a15d // Fixed chart for period before the store creation Damien Metzger 2013-10-24 11:17:15 +02:00
• d173b2d4cd Merge pull request #880 from djfm/bootstrap Damien Metzger 2013-10-24 01:45:41 -07:00
• baed28f1a7 // use automatic path for css in mail template header djfm 2013-10-24 08:37:08 +00:00
• 9a7c3dd88f // small fix Rémi Gaillard 2013-10-24 10:14:44 +02:00
• 81945cef71 [-] FO : Follow up https://github.com/PrestaShop/PrestaShop/pull/879 gRoussac 2013-10-24 10:00:19 +02:00
• 1cc0134ec3 Merge pull request #879 from neemzy/development Gregory Roussac 2013-10-24 00:55:55 -07:00
• b9de912dd3 [-] MO : Fixed bug PNM-1431 - referralprogram Lack the % sign Fabio Chelly 2013-10-24 09:53:16 +02:00
• e17dd1fdde // theme installation Damien Metzger 2013-10-24 09:49:27 +02:00
• 6d3640e895 Conditions to hide VAT fields fail if there are no company fields Tom Panier 2013-10-24 09:43:50 +02:00
• d9382a0a5b // update mail template Sarah Lorenzini 2013-10-24 09:27:18 +02:00
• 9e0125d0b6 // theme installation Damien Metzger 2013-10-23 19:08:58 +02:00
• 56693da6e0 // remove warning Notice: Undefined variable: connections in AdminCustomersController.php on line 702 gRoussac 2013-10-23 19:02:13 +02:00
• 7a8cdf3913 // admin create order WIP Kevin Granger 2013-10-23 18:54:44 +02:00
• 3e33a259ef [-] BO : FIx bug #PSCFV-10736 again, fixing query when product is not in base gRoussac 2013-10-23 18:33:37 +02:00
• e1887425fa [*] BO: Add an option to choose to not import the behavior of taxes displaying for the groups in localization pack import Rémi Gaillard 2013-10-23 18:22:53 +02:00
• 8e506ddff2 [-] BO : FIx bug #PSCFV-10736, could not load a product given from getBoughtProducts gRoussac 2013-10-23 18:16:45 +02:00
• b38073ad72 //watermark now use bootstrap design Vincent Augagneur 2013-10-23 18:01:23 +02:00
• 7a23c169d6 // update css mail template Sarah Lorenzini 2013-10-23 17:58:28 +02:00
• 45bd281504 // update mail templates Sarah Lorenzini 2013-10-23 17:51:29 +02:00
• c72c44f153 Merge pull request #877 from djfm/bootstrap Gregory Roussac 2013-10-23 08:46:16 -07:00
• 52622e6be2 // English djfm 2013-10-23 15:33:15 +00:00
• 758b5f7241 // Started to adapt the install to the new template Damien Metzger 2013-10-23 17:29:59 +02:00
• 69d5cb4ccd [+] FO : New Responsive, Bootstrap template Damien Metzger 2013-10-23 16:55:46 +02:00
• 16dfea95e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-23 16:49:05 +02:00
• a27f8bc999 // Fix Stats datepicker Jerome Nadaud 2013-10-23 16:48:55 +02:00
• 466699edcb // Add units to goals configuration Damien Metzger 2013-10-23 16:36:04 +02:00
• 03ad842697 [-] BO : Fix bug #PSCFV-10790, Customer group names not exploded gRoussac 2013-10-23 16:07:28 +02:00
• 9930c375c7 // Dashgoals :) Damien Metzger 2013-10-23 15:37:27 +02:00
• 554ab9414f [-] BO: product listing should call Product::getPriceStatic() with the product default shop in the context when it is not a shop context Rémi Gaillard 2013-10-23 15:08:02 +02:00
• ff3455be78 // Products combinations form bootstraping Jerome Nadaud 2013-10-23 15:03:28 +02:00
• 747ec9a2c4 // notice on carrierwizard when step back Rémi Gaillard 2013-10-23 14:50:30 +02:00
• c30d103410 // Check if exist children opt. in employees Jerome Nadaud 2013-10-23 14:49:22 +02:00
• fee2da6980 // Add sublime project file to gitignore Jerome Nadaud 2013-10-23 14:35:24 +02:00
• be1299d8d7 // small fix Rémi Gaillard 2013-10-23 14:19:19 +02:00
• 4e1b4cdf90 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-23 12:11:10 +02:00
• 0bf6410773 //Fix save and stay combinations problem Jerome Nadaud 2013-10-23 12:10:36 +02:00
• 2279b959fe // small changes on orders view Rémi Gaillard 2013-10-23 12:10:02 +02:00
• 2f5e15e2b1 Merge pull request #874 from PhpMadman/patch-5 Gregory Roussac 2013-10-23 03:04:25 -07:00
• 8662ef12b4 // small changes on orders view Rémi Gaillard 2013-10-23 11:59:28 +02:00
• 373604fc97 [-] FO: removed width on message product select PhpMadman 2013-10-23 11:52:35 +02:00
• 101b37b40a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-10-23 11:45:26 +02:00
• ad4ecefcf9 [-] FO : Prevent fatal error on getUniqReference when order not loaded gRoussac 2013-10-23 11:44:12 +02:00
• 5ee716ff9e // fix admin edit countries Kevin Granger 2013-10-23 11:18:31 +02:00
• 3e999ab591 [-] MO blockcart #PNM-1685 - [CODE] incorrect spelled variable in ajax-cart.js Fabio Chelly 2013-10-23 10:56:48 +02:00
• 010ad76e6f Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-10-23 10:55:35 +02:00
• 5fd3ad5adf [*] FO ProductSale: improves calculation of most selled products when there are a lot of products in shop Fabio Chelly 2013-10-23 10:55:23 +02:00
• 45ea4aefad // Fix Combinations ajax problem Jerome Nadaud 2013-10-23 10:50:18 +02:00
• 6cddb57ce3 [-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724 Rémi Gaillard 2013-10-23 10:34:00 +02:00
• 9a7af80943 // update mail templates Sarah Lorenzini 2013-10-23 10:13:57 +02:00
• c61cec9f2a //display date on dashproducts && added param date_from & date_to on dashboard hooks Vincent Augagneur 2013-10-23 09:59:16 +02:00
• 48a70cc8ac Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-10-23 09:57:47 +02:00
• 3ec3bf587e //small fix on cache_id in classe Hook Vincent Augagneur 2013-10-23 09:38:22 +02:00
• 9d3f3d1876 // Fixed warning in admin customer tpl Damien Metzger 2013-10-23 09:32:48 +02:00
• ae63336a37 [-] BO : Fix bug #PSCFV-10638, Admin Import by reference moves products to home category gRoussac 2013-10-23 01:41:05 +02:00
• feca06417f // definition on addFeatureValueImport gRoussac 2013-10-23 01:23:35 +02:00
• 5d28d38a22 [-] BO : Fix bug #PSCFV-7907 AdminImport, add custom field to features gRoussac 2013-10-23 01:18:09 +02:00
• a2be0364da // First draft goals Damien Metzger 2013-10-22 19:59:04 +02:00
• 398548fecf Merge pull request #864 from samy-r/features-duplication-escaping Gregory Roussac 2013-10-22 10:20:44 -07:00
• 83d4d0d258 Merge pull request #872 from ldecoker/patch-11 Gregory Roussac 2013-10-22 10:19:31 -07:00
• c401e61b81 Merge pull request #871 from ldecoker/patch-10 Gregory Roussac 2013-10-22 10:18:57 -07:00
• 5bb4d48ddd Merge pull request #870 from djfm/development Gregory Roussac 2013-10-22 10:17:11 -07:00
• e557db6429 Merge pull request #866 from studiokiwik/sk-ps15x-007 Gregory Roussac 2013-10-22 10:15:55 -07:00
• 2c94e6c042 // Add level depth restriction on blockcategories Jerome Nadaud 2013-10-22 19:13:10 +02:00
• dfa59fa8f7 // Fix blockcategories Jerome Nadaud 2013-10-22 19:04:11 +02:00
• ce4170574c [PDF] [-] {else if} instead of {elseif} (B2B invoice template) ldecoker 2013-10-22 18:57:12 +02:00
• e6e2db8400 [PDF] [-] {else if} instead of {elseif} ldecoker 2013-10-22 18:55:32 +02:00
• 537bfb0520 //dash configuration cancel button added Vincent Augagneur 2013-10-22 18:04:08 +02:00
• 766d0e01f4 // Adding reset button to form template Jerome Nadaud 2013-10-22 18:00:39 +02:00
• 67fc91e2c9 // Categories thumbnails Jerome Nadaud 2013-10-22 17:43:10 +02:00
• 3539a779f8 // Oops Damien Metzger 2013-10-22 17:32:02 +02:00
• 4e8ba711d9 // Oops Damien Metzger 2013-10-22 17:14:53 +02:00
• 70d2e6e10b Merge pull request #868 from ldecoker/patch-8 Gregory Roussac 2013-10-22 08:03:06 -07:00
• 7cbaada844 [BO][-] Notice messages when accessing the BO translation page ldecoker 2013-10-22 17:00:56 +02:00
• bc7e8eb355 Merge pull request #867 from PhpMadman/patch-4 Gregory Roussac 2013-10-22 07:50:21 -07:00
• cc1dd2510a // mail template src Sarah Lorenzini 2013-10-22 16:23:05 +02:00
• c458e059d5 // Fix hook list problem on multishop Jerome Nadaud 2013-10-22 16:18:50 +02:00
• bc38b542fe Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-10-22 15:53:43 +02:00
• 2989538ce1 [*] BO Module mailalerts: send e-mail to merchand when product is out of stock Fabio Chelly 2013-10-22 15:53:20 +02:00
• 32a85007df // update mail templates Sarah Lorenzini 2013-10-22 15:45:33 +02:00
• 04f0545254 // forgot to rename a field Damien Metzger 2013-10-22 15:37:33 +02:00
• 1323befe2f // Add link to profitability conf Damien Metzger 2013-10-22 15:36:46 +02:00
• 8ef9e71966 // Refine dashboard net profits Damien Metzger 2013-10-22 15:16:07 +02:00