dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153 Commits 9 Branches 19 Tags
5d090a25b3716654bdb4e00a7a560d1a814e8a5c
Commit Graph
58 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
rMalie 35748d1b8f // Fix #PSFV-6 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7807 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-29 10:02:55 +00:00
rMalie 72de3384a7 // Fix #PSFV-12 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7795 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 14:38:46 +00:00
rMalie a1a32714ab // Fix #PSFV-30 + context part 24 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7792 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 14:12:17 +00:00
rMalie 31ed17058c // Revert test 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7791 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 14:05:38 +00:00
rMalie 939d2a0cf5 // test 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7789 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 14:04:21 +00:00
rMalie ad3e1f1804 // Fix #PSFV-31 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7788 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 13:53:51 +00:00
rMalie d822f2a373 // Fix #PSFV-32 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7787 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 13:51:29 +00:00
rMalie e990ded287 // Fix #PSFV-35 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7785 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 13:48:02 +00:00
rMalie 6a99789015 // Fix #PSFV-34 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7784 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 13:43:56 +00:00
rMalie 77603244c0 // Fix #PSFV-37 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7783 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 13:26:46 +00:00
rMalie 8bfd44085d // Some fix after merge 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7781 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 13:03:43 +00:00
rMalie a875fecb20 // MERGE with 1.4 r7770 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 09:20:57 +00:00
rMalie be4811aa6e // REVERT MERGE 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 13:35:06 +00:00
rMalie e159c925d8 // MERGE with trunk revision 7754 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 12:48:42 +00:00
rMalie 3557765c59 // Fix #PSFV-25 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7752 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 08:36:23 +00:00
rMalie 85fb88a2a4 // Fix #PSFV-24 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7751 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 08:32:52 +00:00
rMalie 8ef7835cd6 // Fix #PSFV-21 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7748 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 08:15:21 +00:00
rMalie ad270d5ea8 // Fix #PSFV-20 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7747 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 08:12:31 +00:00
rMalie ad27647a98 // Fix #PSFV-38 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7746 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 08:08:37 +00:00
rMalie dd5109b3f5 // Fix adminMeta page + bug #PSFV-39 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7745 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 08:03:00 +00:00
rMalie c9ad75fe11 // Routes for dispatcher (part 3) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7743 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-26 16:47:41 +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
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 90efde2a00 // alias.php is now included from autoload.php 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7693 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 12:36:57 +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
rMalie 1a462e0a85 // Fix strict standard on paymentModule + fix stats SQL bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7689 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 09:49:29 +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
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
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 d1510f6f36 // Add file config/alias.php 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7669 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-20 16:13:22 +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
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
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
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 82754451ad git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7618 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-13 12:52:44 +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
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
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
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
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
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 c0e8f46e8e // Fix stats queries 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7537 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-06 16:17:27 +00:00
rMalie 3d9b61023c // Generate .htaccess in adminShopUrl 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7534 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-06 14:35:19 +00:00
rMalie 8ed089decf git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7532 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 13:54:12 +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