Commit Graph

44 Commits

Author SHA1 Message Date
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
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
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 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
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 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
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 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
tDidierjean 2c493137c3 // Context part 11
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7644 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-18 15:50:58 +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 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
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
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 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
rGaillard d218264667 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7531 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 13:52:30 +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
rGaillard 8a59d0dc41 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:54:11 +00:00
rGaillard 69f2f09dc5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:10:43 +00:00
fBrignoli 4a210f98d9 [+] Dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-06-15 16:32:06 +00:00
gBrunier fbe279894a [-] MO : Not correct display of "date_add" for the discounts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6148 b9a71923-0436-4b27-9f14-aed3839534dd
2011-05-03 08:53:37 +00:00
dMetzger eb9d9719be [-] MO : modules exceptions stability improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6140 b9a71923-0436-4b27-9f14-aed3839534dd
2011-05-02 12:36:27 +00:00
dMetzger 92316e3710 [*] MO : theme installer can now manage module exceptions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6128 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 13:41:10 +00:00
vAugagneur 35ff645731 //merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6124 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 12:34:09 +00:00
fBrignoli 56099fa735 // merge 1.4 => 6117
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6118 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 09:09:38 +00:00
fSerny 1bbcd95d9e [-] MO : Changing url in Dibs module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6096 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-28 11:48:24 +00:00
gBrunier 1044d7be8c [-] MO : Fixed bug #PSCFI-1574 - When only one language was activated iso code was still used.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6077 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-27 14:20:08 +00:00
gBrunier 58a6964eb2 [-] MO : Fixed bug #PSCFI-1617 - Sitemap module produced duplicate rows.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6072 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-27 10:28:58 +00:00
fBrignoli 43b6a41bbc // merge 1.4 (5397)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-22 16:00:58 +00:00
rGaillard 2430f917d5 // display_errors deleting
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6015 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-21 07:45:25 +00:00
fBrignoli ca5e60f0b9 // merge 1.4 (5916) => 1.5.x
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5918 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-15 10:30:56 +00:00
tDidierjean f8ee49ed56 [-] FO : fixed bug #PSCFI-1489 - Clicking on "Add to cart" - Button disables all "Add to cart"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5916 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-15 10:17:53 +00:00
rGaillard cfdc0ab1d9 [-] BO: Fixed module configuration when cache is activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5888 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-13 10:11:09 +00:00
aFolletete 10445ad61d // 1.5 branche creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5881 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-12 18:24:40 +00:00