Commit Graph

20 Commits

Author SHA1 Message Date
rMalie 0c40fb9a06 // Merge -> 8910 2011-09-30 08:17:25 +00:00
rMalie 3d89058084 // Merge -> revision 8342 2011-09-05 14:56:02 +00:00
rMalie 66d4533e68 // Merge -> revision 8097 2011-08-17 16:10:20 +00:00
tDidierjean 3d733ae6e2 // Context part 31 2011-08-17 10:07:12 +00:00
rMalie cba5631db0 // Merge -> revision 8076 2011-08-17 08:15:38 +00:00
rMalie d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00
rMalie 792ce71cd4 // Merge -> revision 7979 2011-08-10 08:36:17 +00:00
rMalie 83734c7bb9 // Merge -> revision 7875 2011-08-03 16:16:49 +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 b59d2200f6 // Fix #PSFV-30 + context part 24 2011-07-28 14:12:17 +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 8d3e36c904 // Fix strict standard on paymentModule + fix stats SQL bug 2011-07-22 09:49:29 +00:00
rMalie 73d6f4267b // Context part 16 (shops) 2011-07-20 12:08:15 +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