 vSchoener
|
6b05bbab93
|
// Fix merging issue
|
2011-12-05 18:11:57 +00:00 |
|
|
vSchoener
|
8e8fcd3dfd
|
[-] MO : Mondialrelay, merge 1.4 => 1.5
|
2011-12-05 10:46:33 +00:00 |
|
|
mMarinetti
|
301d26fbce
|
// fix new theme / old php in modules
|
2011-12-02 16:41:22 +00:00 |
|
|
mMarinetti
|
6522914106
|
[+] Project : default theme added
|
2011-12-02 15:24:40 +00:00 |
|
|
rGaillard
|
e00d70b932
|
// Change urls of prestashop api
|
2011-11-28 10:22:58 +00:00 |
|
|
rMalie
|
82c9dead2a
|
// Merge -> 10309
|
2011-11-21 11:05:10 +00:00 |
|
|
vSchoener
|
5647b43be3
|
// Merge 1.4 -> 1.5
|
2011-11-03 13:51:52 +00:00 |
|
|
vSchoener
|
e2acdb76d3
|
// Merge 1.4 => 1.5
|
2011-11-03 13:38:12 +00:00 |
|
|
vSchoener
|
2bc3ca7249
|
// Merge 1.4 => 1.5
|
2011-11-03 09:14:25 +00:00 |
|
|
rMalie
|
a07c14fafd
|
// Merge -> revision 9288
|
2011-10-12 16:04:28 +00:00 |
|
|
rMalie
|
eeb5b16112
|
// Merge -> revision 9221
|
2011-10-11 12:45:12 +00:00 |
|
|
rMalie
|
9510337b1d
|
// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names
|
2011-10-10 12:18:56 +00:00 |
|
|
rMalie
|
d46fbbc039
|
// Merge -> revision 9124
|
2011-10-07 09:54:43 +00:00 |
|
|
rMalie
|
bbc6c6bdc4
|
// Merge -> revision 9061
|
2011-10-05 15:21:55 +00:00 |
|
|
rMalie
|
468306a3ca
|
// Merge -> revision 8952
|
2011-10-03 09:14:01 +00:00 |
|
|
rMalie
|
fe96631b7b
|
// Merge -> revision 8851
|
2011-09-28 16:03:30 +00:00 |
|
|
rMalie
|
91083e190c
|
// Merge -> revision 8800
|
2011-09-27 14:30:06 +00:00 |
|
|
rMalie
|
2180359342
|
// Merge -> revision 8720
|
2011-09-22 15:45:10 +00:00 |
|
|
tDidierjean
|
a7ad178f28
|
//// Merge -> revision 8290
|
2011-09-01 09:53:43 +00:00 |
|
|
rMalie
|
66d4533e68
|
// Merge -> revision 8097
|
2011-08-17 16:10:20 +00:00 |
|
|
rMalie
|
d0dbb5c185
|
// Merge -> revision 8014
|
2011-08-11 12:00:05 +00:00 |
|
|
tDidierjean
|
0310674fe0
|
// Context part 29
|
2011-08-08 13:17:12 +00:00 |
|
|
rMalie
|
90fcde2539
|
// Merge -> revision 7906
|
2011-08-05 13:26:44 +00:00 |
|
|
rMalie
|
e2c8d89e41
|
// Merge with revision 7841
|
2011-08-02 11:43:58 +00:00 |
|
|
tDidierjean
|
9213581a03
|
// Context part 27
|
2011-07-29 14:29:57 +00:00 |
|
|
rMalie
|
c17e7c236d
|
// MERGE with 1.4 r7770
|
2011-07-28 09:20:57 +00:00 |
|
|
rMalie
|
0aba3ba000
|
// Carrier association + discount association
|
2011-07-22 15:53:07 +00:00 |
|
|
rMalie
|
0060d1edab
|
// Remove some other mysql_ in code
|
2011-07-19 11:51:12 +00:00 |
|
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
|
rGaillard
|
d1a13007b9
|
|
2011-07-06 10:10:43 +00:00 |
|
|
fBrignoli
|
1bb4a61a42
|
[+] Dispatcher
|
2011-06-15 16:32:06 +00:00 |
|
|
aFolletete
|
05a58f53e6
|
// 1.5 branche creation
|
2011-04-12 18:24:40 +00:00 |
|