Laurent Destailleur 1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: ChangeLog dev/initdata/mysqldump_dolibarr_3.5.0.sql htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/product/index.php htdocs/user/fiche.php		2014-04-12 00:53:25 +02:00
..
ajax	Fix: String translated twice	2014-02-05 20:57:43 +01:00
boxes	Update box_ficheinter.php	2014-03-26 10:57:07 +01:00
class	Merge remote-tracking branch 'origin/3.5' into develop	2014-04-12 00:53:25 +02:00
db	Fix: Use correct syntax of date into sql requests (with quotes)	2014-03-15 23:12:00 +01:00
filemanagerdol	Removed deprecated code	2014-02-25 04:29:34 +01:00
js	Fix: Image always fit into window when using cropping feature even if	2014-03-18 23:24:00 +01:00
lib	Merge remote-tracking branch 'origin/3.5' into develop	2014-04-12 00:53:25 +02:00
login	Add multicompany->enabled test	2013-12-16 09:45:38 +01:00
menus	We do not force disabling of ckeditor for phones. We let ckeditor	2014-03-31 13:25:40 +02:00
modules	Merge remote-tracking branch 'origin/3.5' into develop	2014-04-12 00:53:25 +02:00
tpl	Merge remote-tracking branch 'origin/3.5' into develop	2014-03-19 22:29:18 +01:00
triggers	Merge remote-tracking branch 'origin/3.5' into develop	2014-04-12 00:53:25 +02:00
actions_extrafields.inc.php	Fix: sql error with postgres when creating extrafield with an upper cas	2014-02-25 15:48:13 +01:00
actions_sendmails.inc.php	Fix: Sending email from thirdparty must add event into agenda if option	2013-09-25 21:36:40 +02:00
actions_setnotes.inc.php	Qual: Mutualize code for actions of editing notes	2014-01-11 13:33:30 +01:00
antispamimage.php
datepicker.php
doxygen.php
get_menudiv.php
index.php
photos_resize.php	Fix: Image always fit into window when using cropping feature even if	2014-03-18 23:24:00 +01:00
search_page.php
tools.php	Fix: Permissions on files	2013-08-06 00:36:21 +02:00