Marcos García de La Fuente 0170d409d3 Merge remote-tracking branch 'upstream/develop' into develop ...

Conflicts:
	htdocs/core/lib/functions.lib.php

2015-03-04 10:16:25 +01:00

..

ajax

Avoid tooltip into tooltip

2015-02-01 01:28:15 +01:00

boxes

Tooltip

2015-02-02 21:09:30 +01:00

class

phpcs

2015-03-04 02:28:16 +01:00

db

Work on supplier order and customer extrafields

2015-02-27 18:05:12 +01:00

filemanagerdol

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

2015-02-07 03:28:36 +01:00

js

Work on timesheet module

2015-03-04 00:53:35 +01:00

lib

Merge remote-tracking branch 'upstream/develop' into develop

2015-03-04 10:16:25 +01:00

login

…

menus

Prepare code for a perday week timesheet input of time spent.

2015-03-01 17:45:36 +01:00

modules

Fix export extrafield on supplier orders

2015-03-04 02:08:51 +01:00

tpl

Reduce a lot of duplicate code. Move all tables of extrafields setup

2015-02-28 20:14:26 +01:00

triggers

WIP Printing System

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

actions_extrafields.inc.php

…

actions_lineupdown.inc.php

Rewrite code for supplier order and invoice to use shared code of

2015-02-28 04:59:27 +01:00

actions_printing.inc.php

WIP Printing System

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

actions_sendmails.inc.php

Work on expense report module

2015-02-21 16:15:54 +01:00

actions_setnotes.inc.php

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

2015-02-28 03:11:15 +01:00

antispamimage.php

…

datepicker.php

Fix : Typo on merge

2015-02-07 06:42:36 +01:00

doxygen.php

…

get_menudiv.php

…

index.html

…

photos_resize.php

Replace <center> tags

2014-11-25 20:13:43 +01: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

…