Laurent Destailleur c2b31a37ba Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	build/makepack-dolibarr.pl
	htdocs/contrat/fiche.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
	htdocs/user/fiche.php

2015-05-11 23:53:38 +02:00

..

admin

ADD extrafields on usergroup

2014-09-22 16:31:58 +02:00

class

Miscellaneous corrections

2014-12-28 20:13:15 +01:00

group

Fix: Missing error management

2015-02-26 14:25:30 +01:00

agenda_extsites.php

Fixed: form outside table

2014-12-08 17:28:26 +01:00

card.php

Better comments

2015-03-23 03:50:55 +01:00

clicktodial.php

Fix remove warnings

2015-04-29 23:39:34 +02: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

Fix for multicompany users.

2015-03-23 04:51:24 +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

Fix: ckeditor area is at wrong place

2014-09-09 15:33:41 +02:00

param_ihm.php

Fixed: Protection to lock language setup in demo mode was not working

2014-11-29 12:11:12 +01:00

passwordforgotten.php

Fix: A little clean of dol_hash usage.

2014-10-18 16:08:15 +02:00

perms.php

Fixed: Bad function/picto for information messages (not a star)

2014-11-28 19:49:42 +01:00