dolibarr/htdocs/user
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 Change generic and setup image title 2015-04-18 23:13:48 +02:00
class Content of popup tooltip on contact and login link 2015-06-26 17:21:03 +02:00
group FIX : update usergroup name 2015-05-22 16:46:28 +02:00
agenda_extsites.php Work on finishing of style 2015-05-31 01:06:51 +02:00
card.php Merge remote-tracking branch 'origin/3.7' into develop 2015-06-29 00:09:28 +02:00
clicktodial.php Save regressions 2015-05-13 09:32:54 +02:00
document.php Merge remote-tracking branch 'origin/3.7' into develop 2015-06-29 00:09:28 +02:00
hierarchy.php NEW Filter "active" by default on user list. 2015-06-20 20:35:57 +02:00
home.php Better error management 2015-05-30 16:14:54 +02:00
index.php NEW Filter "active" by default on user list. 2015-06-20 20:35:57 +02:00
info.php Merge remote-tracking branch 'origin/3.7' into develop 2015-06-29 00:09:28 +02:00
ldap.php Merge remote-tracking branch 'origin/3.7' into develop 2015-06-29 00:09:28 +02:00
logout.php Fix: missing global declarations 2014-08-20 19:03:58 +02:00
note.php Merge remote-tracking branch 'origin/3.7' into develop 2015-06-29 00:09:28 +02:00
param_ihm.php Merge remote-tracking branch 'origin/3.7' into develop 2015-06-29 00:09:28 +02:00
passwordforgotten.php Fix: A little clean of dol_hash usage. 2014-10-18 16:08:15 +02:00
perms.php Merge remote-tracking branch 'origin/3.7' into develop 2015-06-29 00:09:28 +02:00