Laurent Destailleur dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: build/makepack-dolibarr.pl htdocs/adherents/type.php htdocs/core/boxes/box_task.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/js/lib_batch.js htdocs/core/modules/modUser.class.php htdocs/fichinter/card.php htdocs/fourn/commande/card.php htdocs/societe/consumption.php htdocs/user/info.php htdocs/user/note.php htdocs/user/param_ihm.php htdocs/user/perms.php		2015-06-29 00:09:28 +02:00
..
admin	Change generic and setup image title	2015-04-18 23:13:48 +02:00
class	Rename "duree" property of interventions to "duration"	2015-06-11 23:18:29 +02:00
tpl	Tooltip and lib for file cache	2015-01-24 21:46:05 +01:00
apercu.php	#1657 Intervention preview date is not displayed	2014-11-20 06:01:08 +01:00
card.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-06-29 00:09:28 +02:00
contact.php	Missing hook to add button on intervention	2014-09-22 20:16:58 +02:00
document.php	Uniformize code	2015-04-07 03:00:11 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
info.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
list.php	Fix: print_liste_field_titre('');	2015-06-26 06:23:29 +02:00
note.php	Deprecating arbitrary use of dol_htmloutput* functions	2014-07-20 02:32:13 +02:00