Laurent Destailleur 8821fbac76 Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	htdocs/product/fiche.php
	htdocs/user/class/user.class.php

2014-10-30 11:19:29 +01:00

..

admin

ADD extrafields on usergroup

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

class

Merge remote-tracking branch 'origin/3.6' into develop

2014-10-30 11:19:29 +01:00

group

Merge remote-tracking branch 'origin/3.6' into develop

2014-10-12 02:54:34 +02:00

agenda_extsites.php

Add field to select color of the user in user's card

2014-10-16 06:20:54 +02:00

card.php

Fix: Selection of users color was not user owner of event.

2014-10-18 15:35:32 +02:00

clicktodial.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

document.php

New : add attachments on user cards

2014-08-05 16:01:40 +02:00

hierarchy.php

Fix: doxygen

2014-10-30 11:16:45 +01:00

home.php

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

index.php

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02: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

Merge remote-tracking branch 'origin/3.5' into 3.6

2014-08-16 17:37:37 +02:00

passwordforgotten.php

Fix: A little clean of dol_hash usage.

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

perms.php

Fix: Too many parameter

2014-08-01 14:51:40 +02:00