Laurent Destailleur dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php

2015-06-29 00:09:28 +02:00

..

admin

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2015-05-16 02:53:36 +02:00

canvas

Qual: added deprecation hinting

2015-06-01 11:00:11 +02:00

cartes

Renamed llx_c_pays to llx_c_country & field "libelle" to "label"

2014-08-10 13:37:39 +02:00

class

Member type ref is not deprecated

2015-06-01 11:10:52 +02:00

stats

Fixed: Several fix in color management (function at wrong place, mark

2014-12-08 19:12:27 +01:00

agenda.php

Uniformize code.

2014-09-28 16:31:37 +02:00

card_subscriptions.php

Adherent review

2015-05-20 06:25:43 +02:00

card.php

NEW Replace category edition page on members with new select2 component.

2015-06-27 23:01:05 +02:00

cotisations.php

New: Add filter fields on the subscription list

2015-02-14 19:10:40 +01:00

document.php

Prepare code for generic solution where all path are forged using

2015-05-18 22:25:51 +02:00

fiche_subscription.php

Fixed: Missing picto

2014-11-29 20:41:09 +01:00

htpasswd.php

Removed closing php tag

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

index.php

Working on finishing of look

2015-05-22 14:28:02 +02:00

info_subscription.php

Removed closing php tag

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

info.php

Removed closing php tag

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

ldap.php

Deprecating arbitrary use of dol_htmloutput* functions

2014-07-20 02:32:13 +02:00

list.php

NEW Add hooks on list of members to allow an external module to add more

2015-06-22 16:34:25 +02:00

note.php

Add public note to members

2015-04-06 18:58:36 +02:00

type.php

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

2015-06-29 00:09:28 +02:00