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

• b6799d4f2f [*] BO : download attachments directly from the list Damien Metzger 2013-10-28 11:57:27 +01:00
• 4103339f53 [-] BO : AdminImport, fix bug from https://github.com/indesign47/PrestaShop/commit/84454bbc1c7a315e232245c5e43b300b8f153473#commitcomment-4418502 gRoussac 2013-10-28 11:21:25 +01:00
• 9a879bc133 Merge pull request #897 from freedayko/development Gregory Roussac 2013-10-28 03:09:16 -07:00
• 79b7521cac Merge pull request #892 from djfm/bootstrap Damien Metzger 2013-10-28 02:21:50 -07:00
• 7126397bfe // fix scroll vertical nav Kevin Granger 2013-10-28 10:13:35 +01:00
• 4f8d153469 // fixed links in new English mails djfm 2013-10-28 08:47:30 +00:00
• 38f45e3b2c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap djfm 2013-10-28 08:49:24 +00:00
• 8353bc5ac2 // fix attributes-color-container Kevin Granger 2013-10-28 09:32:46 +01:00
• e1d1479f22 [*] FO : Fix bug #PSCFV-10689 handle image legend gRoussac 2013-10-27 23:31:36 +01:00
• 2dbaa5f73b [-] BO : Fix bug #10689, could not set image legend in back office gRoussac 2013-10-27 22:49:25 +01:00
• 9a3cfece69 //missing line feed after disable_modsec gRoussac 2013-10-27 16:05:55 +01:00
• ee06d3114d [*] BO : improved unicode characters replacement in URLs (Russian and Ukrainian characters added) Aleksander Palyan 2013-10-27 15:05:49 +02:00
• c5c861b59e [-] MO : Blockwishlist no product image when id_product_attribute is defined, thanks @Broceliande gRoussac 2013-10-27 13:28:34 +01:00
• 0bc1d21432 [-] MO : Fix NetworkError 404 Not Found on admin in blocklayered.php Julien 2013-10-26 15:08:07 +02:00
• 6f04df8409 // Fixed icon Damien Metzger 2013-10-25 19:06:03 +02:00
• 39f6a2354a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Damien Metzger 2013-10-25 18:58:07 +02:00
• 03857c0576 [*] BO : you can know download the previous file near the upload file input Damien Metzger 2013-10-25 18:55:25 +02:00
• 8b1f9d0560 // small changes on admincms Rémi Gaillard 2013-10-25 18:42:54 +02:00
• 8be88324f9 // Add internet explorer 9 Compat Jerome Nadaud 2013-10-25 18:13:25 +02:00
• e9a802cf23 [*] BO : Added the number of associated products in the product attachments list Damien Metzger 2013-10-25 18:04:27 +02:00
• 4c484afda1 [-] MO : Fix bug #PSCFV-10841, blockcart hides on product page when last product is removed from cart gRoussac 2013-10-25 17:37:32 +02:00
• 5ea880b793 // XHTML norm Jerome Nadaud 2013-10-25 17:37:08 +02:00
• 025b62f995 // norms gRoussac 2013-10-25 17:33:44 +02:00
• c67e71ca59 // layout fix Rémi Gaillard 2013-10-25 17:30:10 +02:00
• 50bc046671 // fix panel header tree actions (search + button) Kevin Granger 2013-10-25 17:24:49 +02:00
• 8f6a5bb3a1 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-10-25 17:01:51 +02:00
• a7d0794c43 [-] BO : Fixed bug PSCFV-9910 using basic queries to prevent locking errors Fabio Chelly 2013-10-25 17:01:28 +02:00
• 6359c1ca33 Merge pull request #893 from neemzy/development Gregory Roussac 2013-10-25 07:42:59 -07:00
• 9a26cf02a8 Turned "true" and "false" strings to proper booleans Tom Panier 2013-10-25 16:36:39 +02:00
• 180b180aee // small changes Rémi Gaillard 2013-10-25 16:24:57 +02:00
• 5ac471deaf // product toolbar Rémi Gaillard 2013-10-25 16:11:33 +02:00
• f472f3e848 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-25 15:55:39 +02:00
• f89c8ed008 // Fix HelperUploader images params Jerome Nadaud 2013-10-25 15:54:53 +02:00
• eb8ea1cba5 [-] CORE : SetEnv in if statement gRoussac 2013-10-25 15:29:15 +02:00
• aa322e4777 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Damien Metzger 2013-10-25 15:22:01 +02:00
• 4e6585a1b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-10-25 15:21:55 +02:00
• a03efe152c [-] CORE : SetEnv not available on all config // @todo curl request on dummy .htacces gRoussac 2013-10-25 15:21:40 +02:00
• e8d5dc8a62 [*] BO : search results improvements (no unaccessible tabs, better display, better information) Damien Metzger 2013-10-25 15:19:03 +02:00
• a49cc68b72 // news design sendtoafriend mails template Sarah Lorenzini 2013-10-25 15:00:08 +02:00
• cae4770e0f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-25 14:58:30 +02:00
• 7aeba25f99 // class_index Rémi Gaillard 2013-10-25 14:58:11 +02:00
• 339f428c23 // fix login - (tabindex, loading, ellipsis) Kevin Granger 2013-10-25 14:58:10 +02:00
• f73716f902 // new design for referralprogram mails template Sarah Lorenzini 2013-10-25 14:55:01 +02:00
• 59a1105fce // small fix on multishop checkboxes Rémi Gaillard 2013-10-25 14:55:27 +02:00
• 81482df1e5 // Fix merge Jerome Nadaud 2013-10-25 14:33:29 +02:00
• 3a749823bb // small fixes in English Email php templates djfm 2013-10-25 12:29:39 +00:00
• 08baa71a05 // Fix on color field in list Jerome Nadaud 2013-10-25 14:29:30 +02:00
• 8d1765f2df Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-25 14:29:02 +02:00
• bff1ad8833 // Some changes to integrate uploader helper Jerome Nadaud 2013-10-25 14:20:42 +02:00
• 52795495bd //Starting Uploader helper Jerome Nadaud 2013-10-25 14:19:51 +02:00
• 3997543e7f // notice Rémi Gaillard 2013-10-25 11:35:01 +02:00
• 087d0d8206 // Fields resizing Damien Metzger 2013-10-25 11:25:00 +02:00
• d59c83e64d Merge pull request #888 from djfm/bootstrap Damien Metzger 2013-10-25 02:18:04 -07:00
• dd009f133f // fixes in php mail templates djfm 2013-10-25 09:12:29 +00:00
• ddf65f3b97 // toolbar nav fixs Kevin Granger 2013-10-25 10:33:45 +02:00
• 0ca5a24e84 // Added field (bootstrap) size in helper form Damien Metzger 2013-10-25 10:16:27 +02:00
• 139ee8f62d // Move back button to left Jerome Nadaud 2013-10-25 09:29:42 +02:00
• 3850cc94d5 // Align save button to right Jerome Nadaud 2013-10-25 09:18:00 +02:00
• 942d3c7151 [-] MO : Fixbug #PSCFV-10679 dateofdelivery PDF invoice array and array gRoussac 2013-10-25 00:01:25 +02:00
• 1e094f4016 [-] FO: Fix bug #PSCFV-10623 blocknewproducts shows products when PS_NB_DAYS_NEW_PRODUCT == 0 gRoussac 2013-10-24 23:29:23 +02:00
• a9643c80c3 // bad commit sorry gRoussac 2013-10-24 22:45:43 +02:00
• 438a3dda2b [-] BO : Fix bug #PSCFV-10718 AdminAttachments old file not deleted on update gRoussac 2013-10-24 22:42:13 +02:00
• 4cd3e1b830 [-] FO: Fix bug #PSCFV-10230, Blockspecials still caching when files cache limit is 0 gRoussac 2013-10-24 21:59:32 +02:00
• 97ef888345 [-] FO: Fix bug #PSCFV-10625 Js error on carriers step if AjaxCart disabled gRoussac 2013-10-24 21:28:22 +02:00
• acfc3bc266 // fixe buttons group wrap Kevin Granger 2013-10-24 19:34:25 +02:00
• cd5fa81025 // Fixed boulette Damien Metzger 2013-10-24 19:29:22 +02:00
• 4cb7bd9137 // Changed label Damien Metzger 2013-10-24 19:19:20 +02:00
• 8748b0d240 // Small improvements Damien Metzger 2013-10-24 19:12:37 +02:00
• 279cb99a4e // Add regenerate option to thumbnail creation Jerome Nadaud 2013-10-24 18:52:10 +02:00
• 4207bdff32 Merge pull request #890 from indesign47/patch-14 Gregory Roussac 2013-10-24 09:43:54 -07:00
• 6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security Jerome Nadaud 2013-10-24 18:36:36 +02:00
• 8cb1806e49 // small fixes for Width Height Depth indesign47 2013-10-24 18:13:05 +02:00
• f3d74c9461 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Damien Metzger 2013-10-24 18:13:04 +02:00
• 759fe2f671 // norms gRoussac 2013-10-24 18:09:21 +02:00
• 5ff406cdb8 // css Damien Metzger 2013-10-24 18:09:11 +02:00
• 0416aca547 Merge pull request #889 from PhpMadman/PSCFV-10728 Gregory Roussac 2013-10-24 09:06:43 -07:00
• 5c3058d45b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-24 18:02:42 +02:00
• e3dad946e3 // fixs Kevin Granger 2013-10-24 18:02:13 +02:00
• cc3363011e // rewrited urls for feeder module Rémi Gaillard 2013-10-24 17:54:44 +02:00
• e6d0fe60c3 // new design for mailalerts mails template Sarah Lorenzini 2013-10-24 17:51:59 +02:00
• a02c31f106 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-24 17:53:30 +02:00
• f6dd4a9ee4 // Code review Damien Metzger 2013-10-24 17:49:02 +02:00
• 32d146d880 // admin orders Kevin Granger 2013-10-24 17:36:50 +02:00
• 1a7f9e6c11 // new design for blockwishlist mails template Sarah Lorenzini 2013-10-24 17:35:37 +02:00
• 005a57b077 // new design for blocknewsletter mails template Sarah Lorenzini 2013-10-24 17:27:25 +02:00
• 6a552be7dd //followup now use bootstrap design Vincent Augagneur 2013-10-24 17:23:40 +02:00
• c516035e0e [-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO PhpMadman 2013-10-24 17:19:28 +02:00
• b548f72ac5 // Attributes and values => Product Attributes Damien Metzger 2013-10-24 17:09:00 +02:00
• ea7b8b175e // Fix list title Jerome Nadaud 2013-10-24 17:18:14 +02:00
• c39a74e479 // Renamed Feature into Product Features Damien Metzger 2013-10-24 17:07:47 +02:00
• df639337af // Code cleaning and small fixes Damien Metzger 2013-10-24 17:04:26 +02:00
• f82322e426 //typo Vincent Augagneur 2013-10-24 16:51:55 +02:00
• d2ff076eb1 // Removed useless alert Damien Metzger 2013-10-24 16:43:41 +02:00
• 2931c20914 // Fixed rounding Damien Metzger 2013-10-24 16:38:35 +02:00
• c5324a653b [-] IN: Fix bug #PSCFV-10644 no carrier available after upgrade from 1.4.x gRoussac 2013-10-24 16:31:50 +02:00
• 3cd702da42 [-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793 Rémi Gaillard 2013-10-24 16:30:02 +02:00
• c8e75eec03 // fixed indentation in e-mail html templates djfm 2013-10-24 14:24:13 +00:00
• 65401efcb6 Merge pull request #887 from indesign47/patch-13 Gregory Roussac 2013-10-24 07:22:57 -07:00
• a44cdf785e // new design for followup module mail Sarah Lorenzini 2013-10-24 16:04:23 +02:00
• 84454bbc1c [*] BO : AdminImport add img manufacturers-suppliers indesign47 2013-10-24 16:16:29 +02:00