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

• f89e42a5c5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-08-07 18:12:41 +02:00
• 601bfa628b [-] FO :ProductSale::getBestSales() by modified date renders SQL error, thanks @SebSept gRoussac 2013-08-07 18:10:39 +02:00
• 73f40a6cc6 //fixed carrier wizard typewatch Vincent Augagneur 2013-08-07 17:29:44 +02:00
• 000ff0b462 [-] BO : FixBug Missing check value in options list Jerome Nadaud 2013-08-07 17:15:13 +02:00
• a1786b97b3 [-] FO : expiration date not displayed in email for downloadable product gRoussac 2013-08-07 17:08:50 +02:00
• 1c6eb93951 [-] BO : Check if function mb_encode_mimeheader exist in case some user uninstall it Jerome Nadaud 2013-08-07 17:08:01 +02:00
• 44f7356d44 [-] BO : FixBug message charset problem in mail Jerome Nadaud 2013-08-07 16:40:40 +02:00
• de3b121b11 Merge pull request #507 from jeckyl/patch-3 Gregory Roussac 2013-08-07 07:04:13 -07:00
• 239c5adb5a [-] BO : FixBug smarty email variable override by blockcontact Jerome Nadaud 2013-08-07 15:09:14 +02:00
• 5df213f5ae Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-08-07 15:06:50 +02:00
• 942a946147 Merge pull request #497 from romainberger/development Gregory Roussac 2013-08-07 05:59:29 -07:00
• 5f1506ffc2 [-] BO : FixBug #PSCFV-10037 for to choose a state when state is enabled for country Jerome Nadaud 2013-08-07 14:09:40 +02:00
• d916e65a14 // missing return Rémi Gaillard 2013-08-07 13:56:12 +02:00
• 6ccf3e839d // change passwd in cookie after changed it Rémi Gaillard 2013-08-07 13:51:18 +02:00
• e43f0619ca Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-08-07 11:53:23 +02:00
• cd1ed74d8e [-] BO : FixBug #PSCFV-10038 escaped quote in address fields Jerome Nadaud 2013-08-07 11:53:12 +02:00
• 82621c08ec [-] BO : Do not display root category bool if addrootcategory not in url gRoussac 2013-08-07 11:51:48 +02:00
• d99a5a740e Merge pull request #638 from vinvin27/patch-1 Gregory Roussac 2013-08-07 02:51:21 -07:00
• 843989489d Update AdminPPreferencesController.php vinvin27 2013-08-07 11:47:56 +02:00
• e6a819e5dd // Fix double quote translations Rémi Gaillard 2013-08-07 11:29:34 +02:00
• a32ff1e930 [-] BO : FixBug Missing tpl dir in default layout Jerome Nadaud 2013-08-07 11:17:42 +02:00
• ac21fa9808 [-] MO : Missing image in my account for MODULE WishList gRoussac 2013-08-07 10:56:09 +02:00
• 95f775daa1 [+] BO : Catalog Bulk actions Jerome Nadaud 2013-08-07 10:52:23 +02:00
• d95aae9a7b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-08-07 10:44:42 +02:00
• 816a39fb4f [+] BO : Footer list bulk actions Jerome Nadaud 2013-08-07 10:43:53 +02:00
• 3213b5dffb Merge pull request #635 from cippest/development Gregory Roussac 2013-08-06 11:23:19 -07:00
• f8efd7a329 [-] BO : Fix send e-mails updating tracking number cippest 2013-08-06 19:51:16 +02:00
• 349c98d567 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-08-06 19:07:59 +02:00
• ff16de05de // fix, design and fun ! Kevin Granger 2013-08-06 19:06:56 +02:00
• 7089ce10ef // remove warnings in blockwishlist gRoussac 2013-08-06 19:05:08 +02:00
• bb4a72f46d [+] BO : New Bulk actions button Jerome Nadaud 2013-08-06 19:04:44 +02:00
• b1ea66d510 Merge pull request #528 from ldecoker/patch-7 Gregory Roussac 2013-08-06 09:57:36 -07:00
• 0c4aeb31b8 [+] BO : Better action list button Jerome Nadaud 2013-08-06 18:34:31 +02:00
• bf355e934e Merge pull request #634 from PhpMadman/RefSort Gregory Roussac 2013-08-06 09:13:06 -07:00
• 67b44b5f17 //fixed carrier bug and added typewatch plugin on range validation Vincent Augagneur 2013-08-06 18:04:12 +02:00
• bfa5bae702 // Fixed display of root category Damien Metzger 2013-08-06 17:45:24 +02:00
• 5be8e169f5 // Fixed totally unexplicable behavior Damien Metzger 2013-08-06 17:40:11 +02:00
• ea5f4476a6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-08-06 16:56:05 +02:00
• 5ed75901fb //typo Vincent Augagneur 2013-08-06 16:55:51 +02:00
• 2303677ebf // Rollback a modification in object model Damien Metzger 2013-08-06 16:52:13 +02:00
• a1cf8d462f // Keep remote file retrieval in the right order Damien Metzger 2013-08-06 16:42:10 +02:00
• b701acc8cf // Clean language pack retrieval Damien Metzger 2013-08-06 16:15:08 +02:00
• e4a42ab2b1 Update AdminPPreferencesController.php PhpMadman 2013-08-06 16:08:09 +02:00
• d4270289c1 Update category-product-sort.tpl PhpMadman 2013-08-06 16:06:03 +02:00
• bcaa625f4c //default language fix in carrier wizard Vincent Augagneur 2013-08-06 16:05:36 +02:00
• c8564fa6b2 // Quick CSS fix Damien Metzger 2013-08-06 16:02:22 +02:00
• d783160af0 // Updated installer Damien Metzger 2013-08-06 15:53:36 +02:00
• 375fa451d8 [-] FO : FixBug No warning message when no carriers available from advanced stock management Jerome Nadaud 2013-08-06 15:53:25 +02:00
• 38753716e2 // Hide "is root category" option outside multistore Damien Metzger 2013-08-06 15:42:15 +02:00
• 598a5b3188 [*] FO : Add reference sort to theme PhpMadman 2013-08-06 15:38:25 +02:00
• cd254f8795 [*] FO : Add reference sort to theme PhpMadman 2013-08-06 15:37:10 +02:00
• 5e73f0cb07 [*] BO: Add reference to Options PhpMadman 2013-08-06 15:34:58 +02:00
• 6a54f6efd5 [*] BO: Add reference to FrontController PhpMadman 2013-08-06 15:32:30 +02:00
• 4bd59c14cc [*] FO : Blur for tab navigation, followup a0ee3d3, thanks @Seynaeve gRoussac 2013-08-06 15:21:46 +02:00
• a739117f0d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-08-06 15:20:07 +02:00
• 8103e89874 [*] FO : Blur for tab navigation, followup a0ee3d3c34, thanks @Seynaeve gRoussac 2013-08-06 15:19:47 +02:00
• a0ee3d3c34 Merge pull request #633 from Seynaeve/patch-1 Gregory Roussac 2013-08-06 06:17:06 -07:00
• dbb2b50555 [-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl gRoussac 2013-08-06 15:15:03 +02:00
• c966eea140 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-08-06 15:11:46 +02:00
• 9caf97ff30 // Add check in object model Damien MetzgerandFrancois Gaillard 2013-08-06 15:06:46 +02:00
• 4bf773af65 Update .gitignore Gregory RoussacandFrancois Gaillard 2013-07-01 10:58:54 +02:00
• c9bf17f400 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-08-06 15:09:13 +02:00
• 12a3ef3a12 Merge pull request #486 from PhpMadman/patch-1 Gregory Roussac 2013-08-06 02:49:48 -07:00
• 3839dbee9a / Add check in object model Damien Metzger 2013-08-06 15:06:46 +02:00
• 85e15c00f1 // Added missing french translation in the installer Damien Metzger 2013-08-06 14:30:32 +02:00
• 4d29142907 Allow B2B to navigate through the form with Tab Seynaeve 2013-08-06 14:15:45 +02:00
• ba69e48f72 Merge pull request #488 from camlafit/pr-countriesbrowser Gregory Roussac 2013-08-06 03:07:13 -07:00
• 818e82c09c Merge pull request #486 from PhpMadman/patch-1 Gregory Roussac 2013-08-06 02:49:48 -07:00
• 3f6ee7cfdd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-08-06 11:46:15 +02:00
• 7b600ad07f //small css fix Vincent Augagneur 2013-08-06 11:45:59 +02:00
• fe0afeadc9 [-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl (translation doesnt work), thanks @mypresta-eu gRoussac 2013-08-06 11:45:29 +02:00
• 478e338df0 //added active field on carrier wizard Vincent Augagneur 2013-08-06 11:40:03 +02:00
• 6449437f58 // norms gRoussac 2013-08-06 11:38:34 +02:00
• 084880abda Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-08-06 11:38:24 +02:00
• 16d942b7b6 [*] BO : Do not insert duplicates in product_carrier, thanks @edamart gRoussacandFrancois Gaillard 2013-08-06 11:19:34 +02:00
• 81e4a5f635 [*] BO : Do not insert duplicates in poruct_carrier, thanks @edamart gRoussac 2013-08-06 11:19:34 +02:00
• c0bc3bda29 // Bug fix template override & admin templates Francois Gaillard 2013-08-06 11:13:49 +02:00
• 33bdfa9c96 //added some help Vincent Augagneur 2013-08-06 11:06:36 +02:00
• 1b93d251aa Merge pull request #630 from rimas-kudelis/development Gregory Roussac 2013-08-06 01:51:34 -07:00
• edfe77b74f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-08-06 10:43:14 +02:00
• a69d1c6d05 Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug gRoussac 2013-08-06 10:42:44 +02:00
• f557f24df4 // Fixed module cache key (with the country) Damien Metzger 2013-08-06 10:41:31 +02:00
• 77ba55b090 Merge pull request #629 from ChristopheBoucaut/patch-4 Gregory Roussac 2013-08-06 01:30:46 -07:00
• 5bcfc7d4e9 //carrier wizard step validation part 2 Vincent Augagneur 2013-08-06 10:30:10 +02:00
• 83740496de Update more properties of supplier reference in ProductCore::addSupplierReference() if a reference already exists. Rimas Kudelis 2013-08-06 11:28:42 +03:00
• fe58053439 //carrier wizard step validation Vincent Augagneur 2013-08-06 10:27:32 +02:00
• 0139e3f877 Update WebserviceRequest.php ChristopheBoucaut 2013-08-06 10:22:45 +02:00
• 58cba9f894 // [+] Module - Login Addons Kevin Granger 2013-08-06 10:19:43 +02:00
• 23b9c3b8f9 Merge pull request #627 from davyrolink/upstream Gregory Roussac 2013-08-06 01:10:41 -07:00
• 88d4f57894 //carrier range validation fix Vincent Augagneur 2013-08-06 10:04:54 +02:00
• 29bbe81ae6 // CloudCache removed from AdminPerformanceController Francois Gaillard 2013-08-06 09:25:47 +02:00
• 0b99a7b331 added the smarty var to the hook_params, this makes it possible to create modules that can assign variables to the smarty local scope Davy Rolink 2013-08-05 22:39:35 +02:00
• 5f0ef76731 Merge pull request #626 from davyrolink/upstream Gregory Roussac 2013-08-05 14:13:54 -07:00
• f3361fbedf Bug fix: id_address_invoice was not updated, updateAddressId method of the Cart class Davy Rolink 2013-08-05 22:31:42 +02:00
• bdc9d77c09 // Module List + some design WIP Kevin Granger 2013-08-05 20:42:14 +02:00
• faec5a9226 // small change on fixtures installation Rémi Gaillard 2013-08-05 20:33:39 +02:00
• adceb5ccf5 [-] Fo : Bad date format in order-detail, merge from https://github.com/PrestaShop/PrestaShop/pull/476 thanks @gbelorgey gRoussac 2013-08-05 19:16:44 +02:00
• 9f13b9f7b1 Merge pull request #474 from madef/master Gregory Roussac 2013-08-05 09:52:16 -07:00
• 8be06bba2d [-] BO : FixBug Multiple list pagination error. jeromenadaud 2013-08-05 18:22:30 +02:00
• d585b015c1 // move toolbar delete button on AdminProducts gRoussac 2013-08-05 18:18:35 +02:00