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 |
|
rMalie
|
02a738dce1
|
// Context part 15
|
2011-07-19 16:17:14 +00:00 |
|
tDidierjean
|
52339502b6
|
// Context part 12
|
2011-07-19 09:28:11 +00:00 |
|
rMalie
|
ff81f71449
|
// Context in modules + Shop::sql* methods
|
2011-07-19 09:23:10 +00:00 |
|
tDidierjean
|
6551a3ece7
|
// Context part 11
|
2011-07-18 15:50:58 +00:00 |
|
rMalie
|
4b7dee58b7
|
|
2011-07-18 15:37:31 +00:00 |
|
rMalie
|
e16a8ab8d3
|
// Context part 10
|
2011-07-18 15:27:32 +00:00 |
|
rMalie
|
2d77925e7d
|
// Refactoring of shop class with new context
|
2011-07-12 16:28:20 +00:00 |
|
tDidierjean
|
139bb84f87
|
// Context - first commit
|
2011-07-11 14:32:05 +00:00 |
|
tDidierjean
|
9b288cecf5
|
// revert previous commit
|
2011-07-08 16:12:27 +00:00 |
|
tDidierjean
|
af4c7605de
|
// cancel commit
|
2011-07-08 15:43:24 +00:00 |
|
rMalie
|
1c7225b4dc
|
// Fix stats queries
|
2011-07-06 16:17:27 +00:00 |
|
rMalie
|
fc28eb57bf
|
// blocklayered fix
|
2011-07-06 13:27:41 +00:00 |
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
rGaillard
|
d1a13007b9
|
|
2011-07-06 10:10:43 +00:00 |
|
vAugagneur
|
05440b91e2
|
//merge 1.4 => 1.5
|
2011-04-29 12:34:09 +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 |
|
rGaillard
|
bc191dddab
|
// display_errors deleting
|
2011-04-21 07:45:25 +00:00 |
|
aFolletete
|
05a58f53e6
|
// 1.5 branche creation
|
2011-04-12 18:24:40 +00:00 |
|