14 Commits

Include renames

Author	SHA1	Message	Date
rMalie	08a8ffdcf9	// Merge -> revision 8149	2011-08-22 16:22:16 +00:00
rMalie	e64eb39f48	// Improve multishop ergonomy (you edit this field for) on languages fields	2011-08-22 09:33:16 +00:00
rMalie	a62664471f	// Fix options with bad multishop visibility	2011-08-17 13:12:10 +00:00
rMalie	aa37be28db	// Merge -> revision 8059	2011-08-16 09:10:40 +00:00
rMalie	59c4f5489d	// Fix on shops + remove id_group_shop from stock + fix stock	2011-08-11 09:38:24 +00:00
rMalie	bcd83acb8b	// Refactoring of preferences	2011-08-05 13:21:40 +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
gBrunier	f364758a94	[-] BO : Fixed bug #PSCFI-1684 - Tinymce didn't initialize in IE8 because of an extra comma at the end of the function	2011-04-28 09:08:28 +00:00
fBrignoli	ff49083fb6	// merge 1.4 (5397)	2011-04-22 16:00:58 +00:00
aFolletete	05a58f53e6	// 1.5 branche creation	2011-04-12 18:24:40 +00:00