 tDidierjean
|
4caa9d2775
|
// fix sql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7722 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-25 14:36:30 +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 |
|
|
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
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
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 |
|
|
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 |
|
|
tDidierjean
|
be17931df6
|
// merge 6036 6069 6071 6093
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6094 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-28 11:32:07 +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 |
|
|
aFolletete
|
6f98aff114
|
// merge form 1.4 version (rev. 5937)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5938 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-15 16:46:20 +00:00 |
|
|
mMarinetti
|
d71ca0a6d7
|
// merge for german translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5936 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-15 15:51:05 +00:00 |
|
|
tDidierjean
|
cd6fd464b1
|
[-] SQL : removed unsigned from product stock quantity field
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5933 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-15 15:42:12 +00:00 |
|
|
mMarinetti
|
50531eae8f
|
// merge, fix from 1.4 PSCFI-1466
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5928 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-15 14:39:53 +00:00 |
|
|
mMarinetti
|
118f04c0a6
|
// merge from 1.4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5926 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-15 13:57: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 |
|
|
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 |
|