Commit Graph

1780 Commits

Author SHA1 Message Date
tDidierjean d05d16d399 // Context part 21
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7742 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-26 16:40:17 +00:00
tDidierjean 51b4c8591d // Context part 20
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7740 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-26 15:55:04 +00:00
rMalie 4f76b91de5 // Routes for dispatcher (part 2)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7728 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-25 20:16:53 +00:00
rMalie 771e36aecb // Routes for dispatcher (part 1)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7727 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-25 17:33:46 +00:00
tDidierjean 0fbd146713 // Context part 19
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7724 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-25 16:42:48 +00:00
tDidierjean 9e349dd274 // Context part 18
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7723 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-25 15:19:39 +00:00
rMalie 6814ae87c6 // Carrier range price / weight for multishop + fix duplicate of carrier_lang when a new shop is created
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7716 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-25 10:32:56 +00:00
rMalie e08b70a242 // Carrier association + discount association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7696 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-22 15:53:07 +00:00
rMalie 10e68bda6b // Add scenes for multistore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7692 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-22 12:27:42 +00:00
tDidierjean e72ae93557 // Context part 17
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7688 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-22 09:35:28 +00:00
rMalie e62be3d793 // id_shop on cart product (for links) + change Shop::sqlAsso() + share_order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7687 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-22 08:57:51 +00:00
tDidierjean 9619b93c73 // fix delete customization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7681 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-21 16:41:12 +00:00
tDidierjean 462c362191 // removing cookie from product customization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7680 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-21 14:38:04 +00:00
rMalie ff2df3e3b3 // Improve Db class + add _db.php class in overrides for bench
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7678 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-21 12:02:25 +00:00
tDidierjean 884e95f307 // fix mysql insert_id
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7671 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-21 08:05:53 +00:00
rMalie 811018f78c // Fix abstract static methods in Db class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7670 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-20 16:15:05 +00:00
rMalie e921117581 // Add config/alias.php file + refactoring of DB / MySQL classes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7668 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-20 16:10:12 +00:00
rMalie 42da42f827 // Context part 16 (shops)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7664 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-20 12:08:15 +00:00
rMalie 4ae81d8acd // Context part 15
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7658 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 16:17:14 +00:00
rMalie 3baf0f02a5 // Fix minor bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7656 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 14:10:44 +00:00
rMalie 5a1d73862a git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7655 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-19 13:55:53 +00:00
tDidierjean e91c92ce98 // Context part 14
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7653 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 12:28:30 +00:00
rMalie fce17efbb8 // Remove some other mysql_ in code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7652 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 11:51:12 +00:00
rMalie fa2fc8b69d // No more mysql_error() hard coded !
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7651 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 11:35:33 +00:00
rMalie 35e5efb530 // Context part 13
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7650 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 09:44:10 +00:00
tDidierjean 89213e18e5 // Context part 12
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7649 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 09:28:11 +00:00
rMalie 8a0a62ae03 // Context in modules + Shop::sql* methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7648 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 09:23:10 +00:00
rMalie 0452f08f64 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7643 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-18 15:37:31 +00:00
rMalie 7b8f139103 // Context part 10
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7642 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-18 15:27:32 +00:00
tDidierjean 311e8ab964 // Context part 8
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7633 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-15 16:41:39 +00:00
tDidierjean 20276404a8 // Context part 7
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7629 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-15 13:59:26 +00:00
tDidierjean 3a922aabfe // Context part 6
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7625 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-13 16:35:06 +00:00
tDidierjean e5c68ba9ae // Context part 5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7624 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-13 15:24:38 +00:00
rMalie 39e2b09219 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7620 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-13 13:26:40 +00:00
rMalie 67c80b2b42 // Refactoring of shop class with new context Part 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7617 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-13 12:52:09 +00:00
tDidierjean c5cc771f16 // Context part 4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7607 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-13 07:51:09 +00:00
rMalie a6c08c7340 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7605 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-12 16:28:33 +00:00
rMalie 10dd3db8d4 // Refactoring of shop class with new context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7604 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-12 16:28:20 +00:00
tDidierjean 9f7c369d53 // Context part 3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7603 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-12 16:25:27 +00:00
rMalie 50f9794383 // Context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7600 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-12 13:50:15 +00:00
tDidierjean 25b1bceffd // Context part 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7598 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-12 12:50:00 +00:00
rMalie 39d0acc30b // Hook modules exceptions now works with new dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7587 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-11 15:16:16 +00:00
tDidierjean 143022e488 // Context - first commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7586 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-11 14:32:05 +00:00
rMalie 2ee764963b // Fix shop association on new object + some strict standard for Franck
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7584 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-11 13:18:17 +00:00
rMalie 4f3aad65e3 // Multishop for referrers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7583 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-11 13:03:26 +00:00
tDidierjean 8bf1b23239 // revert previous commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7573 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 16:12:27 +00:00
tDidierjean f085f81d23 // cancel commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7572 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 15:43:24 +00:00
rMalie c0d49e1455 // Fix bug on static property call on dynamic class (don't work on php < 5.3)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7569 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 15:20:16 +00:00
rMalie 3c50152c94 // Some fix + multistore for import tools
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7546 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-07 12:18:27 +00:00
rMalie 874478118f // blocklayered fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7529 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-06 13:27:41 +00:00