Laurent Destailleur 94d3e6d3cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php

2013-08-24 22:45:57 +02:00

..

ajax

Qual: Clean code of box management

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

boxes

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

2013-08-24 22:41:32 +02:00

class

Fix: header already sent

2013-08-24 22:09:32 +02:00

db

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

2013-07-24 15:25:00 +02:00

filemanagerdol

Fix: Permissions on files

2013-08-06 00:36:21 +02:00

js

[ bug #971 ] html.form.class.php select_contact with autocomplete do not

2013-07-08 12:51:17 +02:00

lib

Merge pull request #1194 from grandoc/develop

2013-08-24 13:43:36 -07:00

login

Fix: CRLF

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

menus

Fix: Bad translation (to pick to 3.4)

2013-08-24 21:41:36 +02:00

modules

Merge pull request #1194 from grandoc/develop

2013-08-24 13:43:36 -07:00

tpl

Merge pull request #1190 from altairis-fr/develop

2013-08-23 00:18:08 -07:00

triggers

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2013-08-24 22:45:57 +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

Fix: Permissions on files

2013-08-06 00:36:21 +02:00