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

Conflicts:
	htdocs/admin/dict.php
	htdocs/core/db/mysql.class.php
	htdocs/core/db/mysqli.class.php
	htdocs/core/lib/ajax.lib.php

2014-08-17 19:34:12 +02:00

..

admin

Fix : [ bug #1549 ] Itïs not possible add ExtraFields

2014-08-06 17:38:44 +02:00

class

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

2014-08-13 19:25:55 +02:00

group

Migrated old message notifications to the """new""" system

2014-07-20 00:10:40 +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

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

fiche.php

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

2014-08-04 22:19:53 +02:00

hierarchy.php

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

2014-06-06 12:00:21 +02:00

home.php

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

2014-06-06 12:00:21 +02:00

index.php

New: Supervisor is now visible into user list.

2014-08-03 11:36:00 +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: Too many parameter

2014-08-01 14:26:13 +02:00

note.php

Removed closing php tag

2014-05-03 18:18:44 +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

Removed closing php tag

2014-05-03 18:18:44 +02:00

perms.php

Fix: Too many parameter

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