Commit Graph

5 Commits

Author SHA1 Message Date
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
Regis Houssin
46272cf4cd Fix: for avoid error with function "complete_head_from_modules" 2015-06-26 15:26:08 +02:00
Laurent Destailleur
b327b5fb9d Save regressions 2015-05-13 09:32:54 +02:00
Laurent Destailleur
ab25b149c5 Fix: Download of user files 2014-11-24 15:40:40 +01:00
Maxime Kohlhaas
1b3efbb9a3 New : add attachments on user cards 2014-08-05 16:01:40 +02:00