 rMalie
|
f2b5ee338b
|
// Merge -> revision 7875
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-03 16:16:49 +00:00 |
|
|
rMalie
|
ffeb22bfb9
|
// Merge with revision 7841
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 11:43:58 +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
|
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 |
|
|
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
|
ba9cdcf295
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7523 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 10:11:35 +00:00 |
|
|
mMarinetti
|
9ff675b1e2
|
// added keywords properties for tpl and js, needed for alpha
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7074 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-06-15 18:28:34 +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
|
273dc289ef
|
[-] FO : Fixed bug #PSCFI-1718 - Categories block doesn't show categories when processing empty cart checkout. There was a javascript error.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6133 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-05-02 08:56:16 +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 |
|
|
aNiassy
|
e60a8b9203
|
[-] FO : #PSCFI-1674 Display problem about tax identification with guest checkout activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6106 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-28 14:46:25 +00:00 |
|
|
gBrunier
|
ab4e96b921
|
[-] FO : Fixed #PSCFI-1611 - Comment mistake
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6052 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-24 15:50:33 +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 |
|
|
aNiassy
|
16d8501d7c
|
#PSCFI-1568 [-] FO : fixed an ajax bug concerning message in one page checkout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6043 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-22 09:56:48 +00:00 |
|
|
tDidierjean
|
38cf360a0b
|
// merge 6001,6010,6012,6013
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6018 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-21 08:01:09 +00:00 |
|
|
gBrunier
|
8af1e762a3
|
[-] FO : fixed bug PSCFI-1455 - Class "warning-inline" doesn't exist. Changed to "warning_inline"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5982 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-19 14:14:10 +00:00 |
|
|
gBrunier
|
d53096c974
|
[-] FO : fixed bug #PSCFI-1475 - An error occured because of an undefined variable $tag. The variable has been renamed as $search_tag to fix it.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5932 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-15 15:20:42 +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 |
|