Laurent Destailleur 1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php

2013-06-24 20:02:02 +02:00

..

ajax

Qual: Clean code of box management

2013-04-23 16:18:26 +02:00

boxes

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

class

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

db

Added group_concat equivalent to PgSQL

2013-06-19 15:54:27 +02:00

filemanagerdol

Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap

2013-04-25 01:13:13 +02:00

js

Fix: Do not use deprecated function

2013-03-13 23:05:34 +01:00

lib

Merge remote-tracking branch 'origin/3.4' into develop

2013-06-24 20:02:02 +02:00

login

Fix: CRLF

2013-05-03 18:33:23 +02:00

menus

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

modules

New: Add property hidden into module descriptor to allow to hide a

2013-06-24 18:31:56 +02:00

tpl

Merge remote-tracking branch 'origin/3.4' into develop

2013-06-24 20:02:02 +02:00

triggers

New: [ task #823 ] Shipping_validate email notification

2013-04-21 14:14:30 +02:00

admin_extrafields.inc.php

Update admin_extrafields.inc.php

2013-04-10 22:38:45 +03:00

antispamimage.php

Fix: Check consitency of option NOREQUIREXXX

2013-02-24 14:54:08 +01:00

datepicker.php

Qual: Work to prepare usage of jquery data plugins.

2013-04-18 19:37:50 +02:00

doxygen.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

get_menudiv.php

Fix: Var not initialized

2013-06-01 23:46:36 +02:00

index.php

…

photos_resize.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

search_page.php

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

tools.php

New: Use div instead of tables into login page.

2013-02-24 14:57:49 +01:00