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

• ff876034b4 // Fixed display of the image option "legacy system" Damien Metzger 2013-06-14 09:56:41 +02:00
• 76f686a95b Merge pull request #496 from matthieume/master Damien Metzger 2013-06-14 00:28:39 -07:00
• 7a91d4b4dd // small fix on toolbar Rémi Gaillard 2013-06-13 19:23:58 +02:00
• 1a2ee6c8be Merge pull request #489 from axome/core_cartrule_gift_with_same_category_restriction Damien Metzger 2013-06-13 10:13:22 -07:00
• cd6f415dc1 [-] BO : fixed link in AdminTracking #PSCFV-7409 Damien Metzger 2013-06-13 18:37:41 +02:00
• b0eaf8124c [*] BO : Init Bootstrap (Sass) BO Kevin Granger 2013-06-13 18:19:50 +02:00
• 4a1de9bf31 Merge pull request #495 from SebSept/development Vincent Augagneur 2013-06-13 09:07:26 -07:00
• 86ef69c9ba [*] BO : Init Bootstrap (Sass) BO Kevin Granger 2013-06-13 18:03:34 +02:00
• 6a2eddd81f [-] BO : fix require path to config.inc.php Seb 2013-06-13 17:59:01 +02:00
• 518998ded2 //added bootstrap in BO Vincent Augagneur 2013-06-13 16:35:14 +02:00
• 80908e0a6f [-] MO : do not check the VAT number if the module is disabled #PSCFV-9397 Damien Metzger 2013-06-13 16:34:34 +02:00
• be0d6f1c6c // Just to be sure that we will not have any regression Damien Metzger 2013-06-13 15:35:17 +02:00
• 534c10562f [*] Installer : added cookie mode instead of session for the installer Damien Metzger 2013-06-13 15:27:54 +02:00
• fafb7fdef7 [-] BO: Fix #PSCFV-8904 bad id_warehouse is stored on ps_address table Rémi Gaillard 2013-06-13 15:05:55 +02:00
• f5dfb12e4d [-] BO: association of product attributes on associating a product to another shop #PSCFV-8735 Rémi Gaillard 2013-06-13 14:30:21 +02:00
• e8288c5d7a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-06-13 12:02:09 +02:00
• 5bf4c17f4a [-] WS: Fix webservice sort for multishop fields #PSCFV-5634 Rémi Gaillard 2013-06-13 12:01:51 +02:00
• ecf59957ba [-] FO : fixed pdf template #PSCFV-9430 Damien Metzger 2013-06-13 11:18:03 +02:00
• babfbaa2d2 // Added missing space in installer Damien Metzger 2013-06-13 11:00:01 +02:00
• d6b884b7b5 [-] MO : removed doubled "/" in homeslider template #PSCFV-9439 Damien Metzger 2013-06-13 10:34:35 +02:00
• e4535e892d [-] MO : fixed editorial issue when the entity does not exist yet for a shop #PSCFV-9442 Damien Metzger 2013-06-13 10:31:39 +02:00
• a4e6ddf29c [*] MO : blocklayered optimization Damien Metzger 2013-06-13 09:42:34 +02:00
• b401ceb9d9 [-] MO : do not truncate order return state in pscleaner #PSCFV-9431 Damien Metzger 2013-06-13 08:57:15 +02:00
• 5d6d06f8fb [-] BO: Fix #PSCFV-9428 features duplicated with multishop on Feature::getFeatures() Rémi Gaillard 2013-06-12 18:24:14 +02:00
• 1cd9d1bb7a [-] FO: Fix shop restriction on features #PSCFV-7848 Rémi Gaillard 2013-06-12 17:38:46 +02:00
• b3a823f876 [-] BO: Fix #PSCFV-7763 Re-inject quantities after deleting a product from a order Rémi Gaillard 2013-06-12 17:08:00 +02:00
• 91ececef1a // missing return statement Rémi Gaillard 2013-06-11 12:19:04 +02:00
• 7ed9ceb593 [-] BO: Addresses are now totally deleted from the database if not used on a order Rémi Gaillard 2013-06-11 12:18:05 +02:00
• cafbed08ee NewProductController: new products page must display latest products first. MatthieuB 2013-06-10 21:13:23 +02:00
• f3000f6c65 [-] BO: Fix #PSCFV-6657 translations of overriden admin templates Rémi Gaillard 2013-06-10 18:23:59 +02:00
• 72def39102 [-] CORE : CartRule::checkProductRestrictions : A gift product in the same category as its restrictions causes the gift to stay in the cart even if emptied Nicolas Sorosac 2013-06-10 17:43:03 +02:00
• 1838003353 [-] WS: Fix #PSCFI-7009 product prices on orders with specific prices Rémi Gaillard 2013-06-10 16:59:02 +02:00
• d64b5efd10 [-] WS: Fix deletion of product_features on product update #PSCFI-6740 Rémi Gaillard 2013-06-10 16:23:16 +02:00
• 433e9338d9 //fix notice Vincent Augagneur 2013-06-10 12:16:23 +02:00
• 5ec9aa56ac //small fix Vincent Augagneur 2013-06-10 12:15:11 +02:00
• 663ec76bb9 Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE cam.lafit 2013-06-10 10:43:01 +02:00
• 12872fea65 [-] BO - fixed bug #PSCFV-9071 - PS_SHOP_DOMAIN and PS_SHOP_DOMAIN_SSL have not updated after updated Shop domain and SSL domain from Preferences > SEO & URLs Vincent Augagneur 2013-06-10 10:47:57 +02:00
• a73326bfb2 [-] FO - fixed bug #PSCFV-9075 Vincent Augagneur 2013-06-10 10:22:44 +02:00
• 0334f593da [-] FO : fixed bug #PSCFV-9092 - conflict on the company field during account creation Vincent Augagneur 2013-06-10 10:10:56 +02:00
• 2f40c3126b [-] FO: fixed w3c errors sLorenzini 2013-06-07 18:06:48 +02:00
• d441725ccd // Small improvement on pscleaner Damien Metzger 2013-06-07 18:01:53 +02:00
• b5748e8a46 [-] FO: solved some W3C errors sLorenzini 2013-06-07 17:48:48 +02:00
• 3d614ca8ea [-] CORE : fixed bug #PSCFV-9121 - virtual product does not have link after upgrade - part 2 Vincent Augagneur 2013-06-07 16:41:33 +02:00
• 35d9d9d979 [-] CORE : fixed bug #PSCFV-9121 - virtual product does not have link after upgrade Vincent Augagneur 2013-06-07 16:40:37 +02:00
• 06af6bdfb5 [-] FO: some W3C errors corrected sLorenzini 2013-06-07 16:30:45 +02:00
• 90530a10f4 [-] MO : loyalty small smarty fix #PNM-1305 Damien Metzger 2013-06-07 16:01:43 +02:00
• 26608cea48 [-] MO : Fixed double creation of vouchers in loyalty and some redirections #PNM-1317 Damien Metzger 2013-06-07 15:52:27 +02:00
• 1688c7b0e6 [-] FO: Fix no image displayed for products in the cart when it was added from another store in multishop #PSCFV-9385 Rémi Gaillard 2013-06-07 15:37:38 +02:00
• aa41d6b762 // No escape in JS links Damien Metzger 2013-06-07 12:33:44 +02:00
• 77864b88ae [-] FO : In stock sort is now removed when Stock managment is disabled on default theme. PhpMadman 2013-06-07 10:41:02 +02:00
• e65f68107f [-] MO : Followup : Don't send followup vouchers to guest accounts Nicolas Sorosac 2013-06-07 08:42:24 +02:00
• 0e75dbdbf8 [*] BO : attributes taken into account for the language entity in the localization packs Damien Metzger 2013-06-06 18:53:35 +02:00
• b51641ca49 [-] WS: Fix memory leak when getting synopsis Rémi Gaillard 2013-06-06 16:59:03 +02:00
• 12ab790579 [-] MO : Followup : Don't execute crontasks if the module is disabled Nicolas Sorosac 2013-06-06 16:30:16 +02:00
• 6222974430 // W3C Damien Metzger 2013-06-06 15:48:46 +02:00
• ca64179950 // W3C Damien Metzger 2013-06-06 15:27:14 +02:00
• beab13e966 // revert from Merge pull request #458 from runningz https://github.com/runningz/PrestaShop/commit/040ff3396ac32a1cc35d4d2464e8d36486cac418 gRoussac 2013-06-06 11:24:21 +02:00
• e5e93a6100 [-] FO : Report of #PSCFI-7240 typos in cms.tpl gRoussac 2013-06-06 10:39:03 +02:00
• 3b23558ebb [-] MO : Report of #PNM-1413 when alert already set on default combination gRoussac 2013-06-06 10:25:41 +02:00
• 81e8d76d31 // revert gRoussac 2013-06-06 10:15:40 +02:00
• 896658633e [*] MO : Followup https://github.com/runningz/PrestaShop/commit/040ff3396ac32a1cc35d4d2464e8d36486cac418 gRoussac 2013-06-06 10:07:48 +02:00
• 83d3bed712 Merge pull request #478 from djfm/development Damien Metzger 2013-06-05 06:56:07 -07:00
• 73a372bab2 // Disable autocomplete on radio button in installer, error fixed with Chrome browser Francois Gaillard 2013-06-05 10:41:46 +02:00
• ba1c4b9f3a [-] FO: http page should be redirected to http when accessed with https #PSCFV-9212 Rémi Gaillard 2013-06-04 16:27:47 +02:00
• 23afba3c59 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-06-04 16:14:45 +02:00
• 5ec36dac88 [-] MO - fixed bug #PSCFV-9111 - Mailalert emails do not follow the new {color} Vincent Augagneur 2013-06-04 16:14:34 +02:00
• 2f2d19cdbb [*] LO : Fix PSCFV-9330 (decimals=2) djfm 2013-06-04 13:32:35 +00:00
• 5d9d3938e5 // small change on optimization tips for smarty Rémi Gaillard 2013-06-04 15:20:09 +02:00
• 682d10143e [-] BO fixed bug #PSCFV-9130 - Ordering Categories by Name does not work correctly Vincent Augagneur 2013-06-04 14:50:20 +02:00
• 05767a213e [*] Installer: you can now choose to send an email to the administrator after installation with php-cli Rémi Gaillard 2013-06-04 14:21:18 +02:00
• 4c5b060e92 [-] Core: Hook actionPaymentConfirmation should also be called for PS_OS_WS_PAYMENT order statuse Rémi Gaillard 2013-06-04 12:08:31 +02:00
• 22352d1443 [-] BO : Fix bug #PNM-788 Loyalty points in adminCustomers when only one order gRoussac 2013-06-04 10:58:41 +02:00
• 66522c4a2c // Add translate() as deprecated PrestaEdit 2013-06-03 22:46:52 +02:00
• 88369ef1f6 [-] FO: Fix Category::getSubCategories() default group used #PSCFV-9356 Rémi Gaillard 2013-06-03 18:18:54 +02:00
• 371edf9edb Keep retro-compatibility Maxence 2013-06-03 13:28:51 +02:00
• 67ae393b79 Merge pull request #436 from prestarocket/development Vincent Augagneur 2013-06-03 02:53:37 -07:00
• 6d84d5833d [-] FO: Fix Order::getOrdersTotalPaid() reference is now a string #PSCFV-9342 Rémi Gaillard 2013-06-03 11:49:55 +02:00
• 53426b6430 Merge pull request #465 from PhpMadman/patch-4 Vincent Augagneur 2013-06-03 02:04:10 -07:00
• e0c4e4c0f4 Merge pull request #470 from emily-d/patch-2 Vincent Augagneur 2013-06-03 01:33:28 -07:00
• 879aa9f98a Use PrestaShop norme Maxence 2013-06-02 20:18:59 +02:00
• 10e3fec8a2 Add page limit to Collection Maxence 2013-06-02 21:04:48 +03:00
• 2b82287459 [ - ] TR : wrong translation, Ireland is the english name, it should be Irlande in french. emily-d 2013-06-01 23:29:09 +02:00
• 6ae0dbb4ca [*] BO: use Translate::getAdminTranslation instead of translate() PrestaEdit 2013-06-01 00:21:28 +02:00
• 58e5ea606c [~] Controller: AdminTranslationsController / Back translations PrestaEdit 2013-06-01 00:46:24 +03:00
• ff2c3725d3 [-] Bo : Fix #PSCFV-9306 report of #PSCFI-7115 Add a new specific price = faulty validation gRoussac 2013-05-31 18:10:41 +02:00
• f84e8331de Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-31 17:39:55 +02:00
• 5a1440efe4 [-] Fix bug #PSCFI-5839 delete attached file from curstomer thread deletion gRoussac 2013-05-31 17:39:34 +02:00
• f7f6175191 [*] BO: hook displayAdminForm / add param fieldset PrestaEdit 2013-05-31 14:58:19 +02:00
• 9b0b56afd2 [-] FO : In stock is now removed when Stock managment is disabled PhpMadman 2013-05-31 00:02:03 +03:00
• dfac99dc64 [-] Classes : Db classe fixed (check InnoDB support MySQL >= 5.6) Francois Gaillard 2013-05-30 16:23:24 +02:00
• 5812b5be71 Merge pull request #450 from djfm/development Vincent Augagneur 2013-05-30 02:17:45 -07:00
• edf02fe90b Merge pull request #454 from MyBB-Services/dev/gb/ajaxcartjs Vincent Augagneur 2013-05-30 02:15:07 -07:00
• 32863ed476 Merge pull request #461 from cinscaen/development Vincent Augagneur 2013-05-30 00:57:56 -07:00
• bce42c7f8d [-] MO: Fix newsletter module mail like newsletter_voucher.html Agence CINS 2013-05-29 21:31:44 +02:00
• f43da83d80 [-] MO: Fix sendtoafriend module #PSCFV-8340 Agence CINS 2013-05-29 18:51:00 +02:00
• 980b45f372 //small addons module install fix Vincent Augagneur 2013-05-29 17:46:27 +02:00
• 760a415e89 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-29 17:25:57 +02:00
• 72bf6dc56d // bad commit gRoussac 2013-05-29 17:25:41 +02:00
• 8ecc6313c1 [-] BO: Fix combinations duplication on multishop with context all for the product duplication #PSCFV-9020 Rémi Gaillard 2013-05-29 12:08:15 +02:00
• cd17b78522 Merge pull request #458 from runningz/patch-1 Gregory Roussac 2013-05-29 02:16:50 -07:00