dolibarr/htdocs/core
Laurent Destailleur 5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
..
ajax Update objectonoff.php 2014-10-18 22:47:12 +02:00
boxes Fix: [ bug #1722 ] Missing link in homepage project's box 2014-12-23 16:37:53 +01:00
class Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
db Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-26 04:44:15 +01:00
filemanagerdol phpcs 2014-07-21 21:07:30 +02:00
js Recherche bug travis 2014-11-07 23:58:30 +01:00
lib Need more info to find bugs 2015-01-17 16:22:37 +01:00
login - New: Match other auth system: Login can be done entering login or 2014-11-14 11:56:05 +01:00
menus Fix: css 2015-01-14 13:51:21 +01:00
modules Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
tpl Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas 2015-01-17 20:29:51 +01:00
triggers A lot of fix in missing intervention trigger. Align key to use same name 2014-11-03 17:23:02 +01:00
actions_extrafields.inc.php New : Add option to allow extrafield to be modified regardless of the document status 2014-10-14 15:27:40 +02:00
actions_printipp.inc.php Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 2014-12-04 13:20:56 +01:00
actions_sendmails.inc.php Miscellaneous corrections 2014-12-28 20:13:15 +01:00
actions_setnotes.inc.php Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 2014-09-27 17:13:15 +02:00
antispamimage.php Update antispamimage.php 2014-11-05 20:02:58 +01:00
datepicker.php Fix: datepicker first day of week can be monday by setting into 2014-12-06 11:00:49 +01:00
doxygen.php Removed closing php tag 2014-05-03 18:18:44 +02:00
get_menudiv.php Removed closing php tag 2014-05-03 18:18:44 +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
photos_resize.php Removed closing php tag 2014-05-03 18:18:44 +02:00
search_page.php Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags 2014-12-26 12:03:29 +01:00
tools.php Removed closing php tag 2014-05-03 18:18:44 +02:00