tDidierjean
|
a7ad178f28
|
//// Merge -> revision 8290
|
2011-09-01 09:53:43 +00:00 |
|
rMalie
|
826d258e70
|
// Refactoring of admin options
|
2011-08-05 15:52:45 +00:00 |
|
rMalie
|
e2c8d89e41
|
// Merge with revision 7841
|
2011-08-02 11:43:58 +00:00 |
|
rMalie
|
3c8c85b1cd
|
// Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script
|
2011-08-02 09:54:23 +00:00 |
|
tDidierjean
|
e9ab32ab1a
|
// Context part 25
|
2011-07-28 14:17: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
|
3dbff71fcd
|
// Add scenes for multistore
|
2011-07-22 12:27:42 +00:00 |
|
tDidierjean
|
6551a3ece7
|
// Context part 11
|
2011-07-18 15:50:58 +00:00 |
|
tDidierjean
|
b09c76f5b4
|
// Context part 5
|
2011-07-13 15:24:38 +00:00 |
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
rGaillard
|
d1a13007b9
|
|
2011-07-06 10:10:43 +00:00 |
|
aFolletete
|
05a58f53e6
|
// 1.5 branche creation
|
2011-04-12 18:24:40 +00:00 |
|