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

• 233c0076b7 // MERGE with trunk revision 7754 rMalie 2011-07-27 12:48:42 +00:00
• 4ade3a0ea0 // remove 1.4 deprecated functions tDidierjean 2011-07-27 09:51:43 +00:00
• 21017fb5d8 // remove 1.4 deprecated functions tDidierjean 2011-07-27 09:51:43 +00:00
• 86fd2a4648 // Context part 22 tDidierjean 2011-07-27 09:01:00 +00:00
• 55ee922b16 // Context part 22 tDidierjean 2011-07-27 09:01:00 +00:00
• 3557765c59 // Fix #PSFV-25 rMalie 2011-07-27 08:36:23 +00:00
• 33b431647d // Fix #PSFV-25 rMalie 2011-07-27 08:36:23 +00:00
• 85fb88a2a4 // Fix #PSFV-24 rMalie 2011-07-27 08:32:52 +00:00
• 351a7d7202 // Fix #PSFV-24 rMalie 2011-07-27 08:32:52 +00:00
• 8ef7835cd6 // Fix #PSFV-21 rMalie 2011-07-27 08:15:21 +00:00
• 8bb4c75411 // Fix #PSFV-21 rMalie 2011-07-27 08:15:21 +00:00
• ad270d5ea8 // Fix #PSFV-20 rMalie 2011-07-27 08:12:31 +00:00
• 03b5d8ae50 // Fix #PSFV-20 rMalie 2011-07-27 08:12:31 +00:00
• ad27647a98 // Fix #PSFV-38 rMalie 2011-07-27 08:08:37 +00:00
• 833e7b3f35 // Fix #PSFV-38 rMalie 2011-07-27 08:08:37 +00:00
• dd5109b3f5 // Fix adminMeta page + bug #PSFV-39 rMalie 2011-07-27 08:03:00 +00:00
• 9f285198be // Fix adminMeta page + bug #PSFV-39 rMalie 2011-07-27 08:03:00 +00:00
• c9ad75fe11 // Routes for dispatcher (part 3) rMalie 2011-07-26 16:47:41 +00:00
• beb5eff300 // Routes for dispatcher (part 3) rMalie 2011-07-26 16:47:41 +00:00
• d05d16d399 // Context part 21 tDidierjean 2011-07-26 16:40:17 +00:00
• ea890721e8 // Context part 21 tDidierjean 2011-07-26 16:40:17 +00:00
• 51b4c8591d // Context part 20 tDidierjean 2011-07-26 15:55:04 +00:00
• a64edf3ff6 // Context part 20 tDidierjean 2011-07-26 15:55:04 +00:00
• fddc7a6a75 // fix missing context tDidierjean 2011-07-26 14:55:04 +00:00
• b7fb4cd8b9 // fix missing context tDidierjean 2011-07-26 14:55:04 +00:00
• 4f76b91de5 // Routes for dispatcher (part 2) rMalie 2011-07-25 20:16:53 +00:00
• 3a97b4b6f3 // Routes for dispatcher (part 2) rMalie 2011-07-25 20:16:53 +00:00
• 771e36aecb // Routes for dispatcher (part 1) rMalie 2011-07-25 17:33:46 +00:00
• 611b180b82 // Routes for dispatcher (part 1) rMalie 2011-07-25 17:33:46 +00:00
• 0fbd146713 // Context part 19 tDidierjean 2011-07-25 16:42:48 +00:00
• a96064b13d // Context part 19 tDidierjean 2011-07-25 16:42:48 +00:00
• 9e349dd274 // Context part 18 tDidierjean 2011-07-25 15:19:39 +00:00
• 2c4f27f1be // Context part 18 tDidierjean 2011-07-25 15:19:39 +00:00
• 4caa9d2775 // fix sql tDidierjean 2011-07-25 14:36:30 +00:00
• 9b0b588b09 // fix sql tDidierjean 2011-07-25 14:36:30 +00:00
• 6814ae87c6 // Carrier range price / weight for multishop + fix duplicate of carrier_lang when a new shop is created rMalie 2011-07-25 10:32:56 +00:00
• 8b2e514197 // Carrier range price / weight for multishop + fix duplicate of carrier_lang when a new shop is created rMalie 2011-07-25 10:32:56 +00:00
• e08b70a242 // Carrier association + discount association rMalie 2011-07-22 15:53:07 +00:00
• 0aba3ba000 // Carrier association + discount association rMalie 2011-07-22 15:53:07 +00:00
• 90efde2a00 // alias.php is now included from autoload.php rMalie 2011-07-22 12:36:57 +00:00
• 0652f0a5de // alias.php is now included from autoload.php rMalie 2011-07-22 12:36:57 +00:00
• 10e68bda6b // Add scenes for multistore rMalie 2011-07-22 12:27:42 +00:00
• 3dbff71fcd // Add scenes for multistore rMalie 2011-07-22 12:27:42 +00:00
• 1a462e0a85 // Fix strict standard on paymentModule + fix stats SQL bug rMalie 2011-07-22 09:49:29 +00:00
• 8d3e36c904 // Fix strict standard on paymentModule + fix stats SQL bug rMalie 2011-07-22 09:49:29 +00:00
• e72ae93557 // Context part 17 tDidierjean 2011-07-22 09:35:28 +00:00
• 112b465f96 // Context part 17 tDidierjean 2011-07-22 09:35:28 +00:00
• e62be3d793 // id_shop on cart product (for links) + change Shop::sqlAsso() + share_order rMalie 2011-07-22 08:57:51 +00:00
• 3f9a9e41d7 // id_shop on cart product (for links) + change Shop::sqlAsso() + share_order rMalie 2011-07-22 08:57:51 +00:00
• 9619b93c73 // fix delete customization tDidierjean 2011-07-21 16:41:12 +00:00
• 89bcfec297 // fix delete customization tDidierjean 2011-07-21 16:41:12 +00:00
• 462c362191 // removing cookie from product customization tDidierjean 2011-07-21 14:38:04 +00:00
• a264942b1a // removing cookie from product customization tDidierjean 2011-07-21 14:38:04 +00:00
• ff2df3e3b3 // Improve Db class + add _db.php class in overrides for bench rMalie 2011-07-21 12:02:25 +00:00
• 5e3d0882ad // Improve Db class + add _db.php class in overrides for bench rMalie 2011-07-21 12:02:25 +00:00
• 884e95f307 // fix mysql insert_id tDidierjean 2011-07-21 08:05:53 +00:00
• b393cb506b // fix mysql insert_id tDidierjean 2011-07-21 08:05:53 +00:00
• 811018f78c // Fix abstract static methods in Db class rMalie 2011-07-20 16:15:05 +00:00
• c9ba8338b4 // Fix abstract static methods in Db class rMalie 2011-07-20 16:15:05 +00:00
• d1510f6f36 // Add file config/alias.php rMalie 2011-07-20 16:13:22 +00:00
• 0d33bd00c7 // Add file config/alias.php rMalie 2011-07-20 16:13:22 +00:00
• e921117581 // Add config/alias.php file + refactoring of DB / MySQL classes rMalie 2011-07-20 16:10:12 +00:00
• 766a38dcd7 // Add config/alias.php file + refactoring of DB / MySQL classes rMalie 2011-07-20 16:10:12 +00:00
• 42da42f827 // Context part 16 (shops) rMalie 2011-07-20 12:08:15 +00:00
• 73d6f4267b // Context part 16 (shops) rMalie 2011-07-20 12:08:15 +00:00
• 4ae81d8acd // Context part 15 rMalie 2011-07-19 16:17:14 +00:00
• 02a738dce1 // Context part 15 rMalie 2011-07-19 16:17:14 +00:00
• 3baf0f02a5 // Fix minor bugs rMalie 2011-07-19 14:10:44 +00:00
• 1fdf4400b7 // Fix minor bugs rMalie 2011-07-19 14:10:44 +00:00
• 5a1d73862a git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7655 b9a71923-0436-4b27-9f14-aed3839534dd rMalie 2011-07-19 13:55:53 +00:00
• 290e1f1f87 rMalie 2011-07-19 13:55:53 +00:00
• e91c92ce98 // Context part 14 tDidierjean 2011-07-19 12:28:30 +00:00
• c620f4ce09 // Context part 14 tDidierjean 2011-07-19 12:28:30 +00:00
• fce17efbb8 // Remove some other mysql_ in code rMalie 2011-07-19 11:51:12 +00:00
• 0060d1edab // Remove some other mysql_ in code rMalie 2011-07-19 11:51:12 +00:00
• fa2fc8b69d // No more mysql_error() hard coded ! rMalie 2011-07-19 11:35:33 +00:00
• 5c16ddce4a // No more mysql_error() hard coded ! rMalie 2011-07-19 11:35:33 +00:00
• 35e5efb530 // Context part 13 rMalie 2011-07-19 09:44:10 +00:00
• ba2922a823 // Context part 13 rMalie 2011-07-19 09:44:10 +00:00
• 89213e18e5 // Context part 12 tDidierjean 2011-07-19 09:28:11 +00:00
• 52339502b6 // Context part 12 tDidierjean 2011-07-19 09:28:11 +00:00
• 8a0a62ae03 // Context in modules + Shop::sql* methods rMalie 2011-07-19 09:23:10 +00:00
• ff81f71449 // Context in modules + Shop::sql* methods rMalie 2011-07-19 09:23:10 +00:00
• 2c493137c3 // Context part 11 tDidierjean 2011-07-18 15:50:58 +00:00
• 6551a3ece7 // Context part 11 tDidierjean 2011-07-18 15:50:58 +00:00
• 0452f08f64 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7643 b9a71923-0436-4b27-9f14-aed3839534dd rMalie 2011-07-18 15:37:31 +00:00
• 4b7dee58b7 rMalie 2011-07-18 15:37:31 +00:00
• 7b8f139103 // Context part 10 rMalie 2011-07-18 15:27:32 +00:00
• e16a8ab8d3 // Context part 10 rMalie 2011-07-18 15:27:32 +00:00
• 0dbcebf01e // Context part 9 tDidierjean 2011-07-18 10:08:07 +00:00
• bc5d36821d // Context part 9 tDidierjean 2011-07-18 10:08:07 +00:00
• 311e8ab964 // Context part 8 tDidierjean 2011-07-15 16:41:39 +00:00
• badba064b2 // Context part 8 tDidierjean 2011-07-15 16:41:39 +00:00
• 20276404a8 // Context part 7 tDidierjean 2011-07-15 13:59:26 +00:00
• 6e93cc2848 // Context part 7 tDidierjean 2011-07-15 13:59:26 +00:00
• 3a922aabfe // Context part 6 tDidierjean 2011-07-13 16:35:06 +00:00
• c8acd7a824 // Context part 6 tDidierjean 2011-07-13 16:35:06 +00:00
• e5c68ba9ae // Context part 5 tDidierjean 2011-07-13 15:24:38 +00:00
• b09c76f5b4 // Context part 5 tDidierjean 2011-07-13 15:24:38 +00:00
• 39e2b09219 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7620 b9a71923-0436-4b27-9f14-aed3839534dd rMalie 2011-07-13 13:26:40 +00:00