rMalie
|
08a8ffdcf9
|
// Merge -> revision 8149
|
2011-08-22 16:22:16 +00:00 |
|
rMalie
|
66d4533e68
|
// Merge -> revision 8097
|
2011-08-17 16:10:20 +00:00 |
|
rMalie
|
cba5631db0
|
// Merge -> revision 8076
|
2011-08-17 08:15:38 +00:00 |
|
rMalie
|
aa37be28db
|
// Merge -> revision 8059
|
2011-08-16 09:10:40 +00:00 |
|
rMalie
|
50234a7297
|
// Fix PDF controllers + order-detail template
|
2011-08-11 15:14:38 +00:00 |
|
tDidierjean
|
8ca035aa55
|
// fix product comparison
|
2011-08-11 08:39:52 +00:00 |
|
rMalie
|
792ce71cd4
|
// Merge -> revision 7979
|
2011-08-10 08:36:17 +00:00 |
|
rMalie
|
c61b127f66
|
// Merge -> revision 7941
|
2011-08-08 16:01:47 +00:00 |
|
rMalie
|
90fcde2539
|
// Merge -> revision 7906
|
2011-08-05 13:26:44 +00:00 |
|
rMalie
|
83734c7bb9
|
// Merge -> revision 7875
|
2011-08-03 16:16:49 +00:00 |
|
rMalie
|
e2c8d89e41
|
// Merge with revision 7841
|
2011-08-02 11:43:58 +00:00 |
|
rMalie
|
c17e7c236d
|
// MERGE with 1.4 r7770
|
2011-07-28 09:20:57 +00:00 |
|
rMalie
|
5f6f018885
|
// REVERT MERGE
|
2011-07-27 13:35:06 +00:00 |
|
rMalie
|
233c0076b7
|
// MERGE with trunk revision 7754
|
2011-07-27 12:48:42 +00:00 |
|
rMalie
|
3f9a9e41d7
|
// id_shop on cart product (for links) + change Shop::sqlAsso() + share_order
|
2011-07-22 08:57:51 +00:00 |
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
rGaillard
|
4d2c770c6f
|
|
2011-07-06 10:11:35 +00:00 |
|
mMarinetti
|
31d94236ac
|
// added keywords properties for tpl and js, needed for alpha
|
2011-06-15 18:28:34 +00:00 |
|
fBrignoli
|
1bb4a61a42
|
[+] Dispatcher
|
2011-06-15 16:32:06 +00:00 |
|
gBrunier
|
2e5f38012f
|
[-] FO : Fixed bug #PSCFI-1718 - Categories block doesn't show categories when processing empty cart checkout. There was a javascript error.
|
2011-05-02 08:56:16 +00:00 |
|
fBrignoli
|
b8f460ed46
|
// merge 1.4 => 6117
|
2011-04-29 09:09:38 +00:00 |
|
aNiassy
|
eb254814c0
|
[-] FO : #PSCFI-1674 Display problem about tax identification with guest checkout activated
|
2011-04-28 14:46:25 +00:00 |
|
gBrunier
|
1494e9a94d
|
[-] FO : Fixed #PSCFI-1611 - Comment mistake
|
2011-04-24 15:50:33 +00:00 |
|
fBrignoli
|
ff49083fb6
|
// merge 1.4 (5397)
|
2011-04-22 16:00:58 +00:00 |
|
aNiassy
|
3467c2662d
|
#PSCFI-1568 [-] FO : fixed an ajax bug concerning message in one page checkout
|
2011-04-22 09:56:48 +00:00 |
|
tDidierjean
|
8b7e400d49
|
// merge 6001,6010,6012,6013
|
2011-04-21 08:01:09 +00:00 |
|
gBrunier
|
11096964e2
|
[-] FO : fixed bug PSCFI-1455 - Class "warning-inline" doesn't exist. Changed to "warning_inline"
|
2011-04-19 14:14:10 +00:00 |
|
gBrunier
|
3d89d128cf
|
[-] 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.
|
2011-04-15 15:20:42 +00:00 |
|
fBrignoli
|
5e2884a8fa
|
// merge 1.4 (5916) => 1.5.x
|
2011-04-15 10:30:56 +00:00 |
|
aFolletete
|
05a58f53e6
|
// 1.5 branche creation
|
2011-04-12 18:24:40 +00:00 |
|