Laurent Destailleur 3844d4e6f7 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: ChangeLog htdocs/core/boxes/box_activity.php htdocs/fourn/commande/card.php htdocs/user/card.php		2015-03-23 15:16:37 +01:00
..
admin	Reduce a lot of duplicate code. Move all tables of extrafields setup	2015-02-28 20:14:26 +01:00
class	Method colorStringToArray can accept the #	2015-03-22 18:17:25 +01:00
group	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-28 03:11:15 +01:00
agenda_extsites.php	Merge remote-tracking branch 'origin/3.7' into develop	2014-12-08 17:51:36 +01:00
card.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-23 15:16:37 +01:00
clicktodial.php	HTML5 - <center> is deprecated - Need CSS - continue working	2014-11-24 06:43:15 +01:00
document.php	Fix: Download of user files	2014-11-24 15:40:40 +01:00
hierarchy.php	Fix: doxygen	2014-10-30 11:16:45 +01:00
home.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-23 15:16:37 +01:00
index.php	Fix for multicompany users.	2015-03-23 04:51:24 +01:00
info.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
ldap.php	Migrated old message notifications to the """new""" system	2014-07-20 00:10:40 +02:00
logout.php	Fix: missing global declarations	2014-08-20 19:03:58 +02:00
note.php	HTML5 - <center> is deprecated - Need CSS - continue working	2014-11-24 06:43:15 +01:00
param_ihm.php	Merge remote-tracking branch 'origin/3.7' into develop	2014-11-30 14:15:38 +01:00
passwordforgotten.php	Fix: A little clean of dol_hash usage.	2014-10-18 16:08:15 +02:00
perms.php	Some fixes into translation and permissions	2015-03-09 21:20:56 +01:00