Laurent Destailleur d66d4f53a5 Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into ...

frederic34-tooltip

Conflicts:
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/product/index.php

2015-01-31 15:41:33 +01:00

..

ajax

…

boxes

Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into

2015-01-31 15:41:33 +01:00

class

Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into

2015-01-31 15:41:33 +01:00

db

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

2014-12-26 04:57:55 +01:00

filemanagerdol

WIP PSR2

2015-01-08 18:36:03 +01:00

js

…

lib

Merge remote branch 'upstream/develop' into tooltip

2015-01-31 09:58:41 +01:00

login

…

menus

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

2015-01-30 15:53:06 +01:00

modules

Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into

2015-01-31 14:29:15 +01:00

tpl

add extrafield type, check box from table

2015-01-18 16:02:31 +01:00

triggers

WIP Printing System

2014-12-08 20:33:26 +01:00

actions_extrafields.inc.php

…

actions_printing.inc.php

WIP Printing System

2014-12-08 20:33:26 +01:00

actions_sendmails.inc.php

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

2015-01-18 18:44:22 +01:00

actions_setnotes.inc.php

…

antispamimage.php

…

datepicker.php

Add support for configurable first day of week

2015-01-15 12:43:13 +01:00

doxygen.php

…

get_menudiv.php

…

index.html

…

photos_resize.php

…

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

…