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
..
blockUI.js	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
datepicker.js.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
dst.js	Corrected Timezone detection by using jstz external library	2015-06-16 21:19:58 +02:00
editinplace.js	New: add possibility to define a custom error message	2014-09-26 09:44:21 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
jnotify.js	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
lib_batch.js	Merge remote-tracking branch 'origin/3.7' into develop	2015-06-29 00:09:28 +02:00
lib_head.js	Upgrade jquery and jquery-ui to last stable version	2015-06-21 00:06:37 +02:00
lib_photosresize.js	Merge tab to upload photo and other files to same tab. This reduce	2015-06-19 11:19:13 +02:00
lib_rare.js	Simplified JS	2013-09-05 16:37:23 +02:00
timepicker.js.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
timesheet.js	FIXME that are not bug are replaced with TODO	2015-04-12 04:01:28 +02:00