rMalie
|
d79fcf00fb
|
// Merge -> revision 9352
|
2011-10-14 08:20:54 +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
|
c4780ec67d
|
// Merge -> revision 8984
|
2011-10-03 15:48:07 +00:00 |
|
rMalie
|
468306a3ca
|
// Merge -> revision 8952
|
2011-10-03 09:14:01 +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 |
|
aFolletete
|
48f666d29d
|
[*] Project : Version 2 of Smarty has been removed for using only version 3
|
2011-09-14 13:27:32 +00:00 |
|
rMalie
|
a1bdb7b35e
|
// Merge -> revision 8507
|
2011-09-12 16:17:37 +00:00 |
|
lCherifi
|
bf9a25fd59
|
integration new theme standard
|
2011-08-23 14:25:09 +00:00 |
|
tDidierjean
|
c28051ae93
|
// Context part 32
|
2011-08-17 13:40:05 +00:00 |
|
tDidierjean
|
3d733ae6e2
|
// Context part 31
|
2011-08-17 10:07:12 +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 |
|
fBrignoli
|
d9fa602cc3
|
[~] Hook::get replaced by Hook::getIdByName
|
2011-08-05 14:49:18 +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 |
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
rGaillard
|
d1a13007b9
|
|
2011-07-06 10:10:43 +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 |
|