Laurent Destailleur 71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 ...

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php

2013-05-20 17:37:08 +02:00

..

ajax

Qual: Clean code of box management

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

boxes

Fix: When box is removed, it is added into combo box of available boxes.

2013-04-25 01:35:33 +02:00

class

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

2013-05-20 17:37:08 +02:00

db

Fix: Import of contact/address not complete and not working with pgsql

2013-04-30 22:56:52 +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

Fix: Security test

2013-05-15 19:57:51 +02:00

login

Fix: CRLF

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

menus

Removed innecesary whitespace when no picto is displayed

2013-05-06 22:59:50 +02:00

modules

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

2013-05-20 17:37:08 +02:00

tpl

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

2013-05-20 17:37:08 +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

Uniformize code, order of fiels in card and language files.

2013-04-28 01:12:40 +02:00

index.php

Fix: Avoid errors into rpm packages

2011-07-31 21:24:20 +00:00

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: Missing translation key

2013-05-11 02:12:34 +02:00

tools.php

New: Use div instead of tables into login page.

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