 rMalie
|
714c65de56
|
// Merg// Merge -> revision 8395
|
2011-09-07 16:23:13 +00:00 |
|
|
rMalie
|
3d89058084
|
// Merge -> revision 8342
|
2011-09-05 14:56:02 +00:00 |
|
|
aFolletete
|
230bebc7c7
|
[+] Project : adding Features detachables in order to improve performance
// clean code
|
2011-09-03 17:21:32 +00:00 |
|
|
tDidierjean
|
a7ad178f28
|
//// Merge -> revision 8290
|
2011-09-01 09:53:43 +00:00 |
|
|
lBrieu
|
d1ccbe5b02
|
|
2011-08-30 13:44:57 +00:00 |
|
|
tDidierjean
|
02f2356696
|
// Merge -> revision 8206
|
2011-08-26 15:52:42 +00:00 |
|
|
rMalie
|
35055a3a70
|
// Merge -> revision 8199
|
2011-08-26 07:59:29 +00:00 |
|
|
fBrignoli
|
8f8ac0670d
|
[*] Project : US + CA TaxSystem
|
2011-08-18 10:10:50 +00:00 |
|
|
rMalie
|
792ce71cd4
|
// Merge -> revision 7979
|
2011-08-10 08:36:17 +00:00 |
|
|
rMalie
|
c3ac9dffa7
|
// Some fix on canonical URL + remove PS_HOMEPAGE_PHP_SELF configuration
|
2011-08-02 14:24:28 +00:00 |
|
|
rMalie
|
7506710b75
|
// Remove AdminAppearance
|
2011-08-02 12:23:11 +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
|
d1a13007b9
|
|
2011-07-06 10:10:43 +00:00 |
|
|
fBrignoli
|
b8f460ed46
|
// merge 1.4 => 6117
|
2011-04-29 09:09:38 +00:00 |
|
|
fBrignoli
|
ff49083fb6
|
// merge 1.4 (5397)
|
2011-04-22 16:00:58 +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 |
|