Commit Graph

25 Commits

Author SHA1 Message Date
rMalie
f1d5a3bf77 // Merge -> revision 9385 2011-10-17 09:55:33 +00:00
rMalie
d79fcf00fb // Merge -> revision 9352 2011-10-14 08:20:54 +00:00
rMalie
a07c14fafd // Merge -> revision 9288 2011-10-12 16:04:28 +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
c4780ec67d // Merge -> revision 8984 2011-10-03 15:48:07 +00:00
rMalie
0c40fb9a06 // Merge -> 8910 2011-09-30 08:17:25 +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
rMalie
a1bdb7b35e // Merge -> revision 8507 2011-09-12 16:17:37 +00:00
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
tDidierjean
02f2356696 // Merge -> revision 8206 2011-08-26 15:52:42 +00:00
rMalie
fd25111d74 // Merge -> revision 8114 2011-08-19 09:46:12 +00:00
rMalie
aa37be28db // Merge -> revision 8059 2011-08-16 09:10:40 +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
923269001b // Fix shop association on new object + some strict standard for Franck 2011-07-11 13:18:17 +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