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

Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php

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

..

admin

ADD extrafields on usergroup

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

class

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

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

group

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

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

agenda_extsites.php

New: Each user can include its own external ics calendar into dolibarr

2014-08-15 17:08:05 +02:00

card.php

New: add context "globalcard" for declaring only once all cards

2014-10-06 07:20:58 +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

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

2014-06-06 12:00:21 +02: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

Merge branch 'develop-HiddenMailPasswordForgotten' of

2014-10-11 23:44:50 +02:00

perms.php

Fix: Too many parameter

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