Laurent Destailleur 5bfc65676c Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: ChangeLog htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/theme/eldy/style.css.php		2016-04-22 21:02:20 +02:00
..
ajax	Merge remote-tracking branch 'origin/3.9' into develop	2016-04-07 20:01:52 +02:00
boxes	FIX Box disabled because bugged	2016-04-07 19:24:29 +02:00
class	Merge pull request #5020 from frederic34/swiftmailer	2016-04-22 20:12:58 +02:00
db	Quality fixes reported by scrutinizer	2016-04-09 15:07:55 +02:00
filemanagerdol	Fix PHPCS	2016-04-09 19:50:13 +02:00
js	Fix bad name	2016-02-05 12:23:16 +01:00
lib	Merge remote-tracking branch 'origin/3.9' into develop	2016-04-22 21:02:20 +02:00
login	Fix #3542	2015-11-13 11:17:23 +01:00
menus	Fix bank submenu error	2016-04-22 11:59:55 +02:00
modules	Merge remote-tracking branch 'origin/3.9' into develop	2016-04-22 21:02:20 +02:00
tpl	Merge pull request #5011 from altatof/supplierorder_noprice	2016-04-22 18:27:42 +02:00
triggers	NEW Renamed ActionComm::add function to ActionComm::create	2016-04-16 21:41:06 +02:00
actions_builddoc.inc.php	Fix pdf generation with thirdparty	2016-04-22 09:46:47 +02:00
actions_changeselectedfields.inc.php
actions_dellink.inc.php
actions_extrafields.inc.php	NEW Can change type of extrafields for some combinations.	2016-03-17 21:58:51 +01:00
actions_fetchobject.inc.php
actions_lineupdown.inc.php
actions_linkedfiles.inc.php	FIX The include file for action on files should not be a template file	2016-04-02 14:16:16 +02:00
actions_printing.inc.php	Merge remote branch 'upstream/develop' into printgcp	2015-11-02 11:43:34 +01:00
actions_sendmails.inc.php	Fix message so it is more clear what the feature can do or not.	2015-12-18 12:48:20 +01:00
actions_setnotes.inc.php	[Qual] Uniformize code	2015-11-19 13:59:58 +01:00
antispamimage.php
datepicker.php	NEW Factorized price2numjs into lib_head.js.php	2015-12-10 17:03:00 +01:00
doxygen.php
extrafieldsinexport.inc.php	Fix: when doing an export of extrafields, we must use different table	2015-12-17 20:40:33 +01:00
get_menudiv.php
index.html
photos_resize.php	NEW Mutualize code: Use one call of function "addThumbs", when possible,	2016-04-09 14:12:21 +02:00
search_page.php	Fix bad link	2016-04-03 12:46:34 +02:00
search.php	FIX The search on user/group was not using new code. Fiels used for	2016-02-07 02:55:56 +01:00
tools.php