Juanjo Menent 38afb1a4e6 Merge remote-tracking branch 'origin/3.7' into 3.8 ...

# Conflicts:
#	htdocs/core/modules/modBarcode.class.php

2015-08-07 12:57:16 +02:00

..

ajax

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

2015-07-19 15:32:20 +02:00

boxes

Merge pull request #3247 from aspangaro/3.8-patch4

2015-07-17 19:13:44 +02:00

class

Merge pull request #3291 from GPCsolutions/hookslogging

2015-08-06 22:11:40 +02:00

db

Show sql query when log level is lower than LOG_DEBUG

2015-07-22 23:33:48 +02:00

filemanagerdol

[Qual] Fixed deprecated HTML nowrap attribute to class

2015-05-12 15:37:35 +02:00

js

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

2015-07-02 13:45:32 +02:00

lib

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

2015-08-06 18:22:29 +02:00

login

Fix: check the user status during authentication

2015-05-29 10:09:18 +02:00

menus

Fix merge menu regresion

2015-08-01 15:43:14 +02:00

modules

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

2015-08-07 12:57:16 +02:00

tpl

Default price for margin was not set

2015-07-28 19:39:42 +02:00

triggers

Fix: missing context before calling trigger.

2015-07-19 15:24:54 +02:00

actions_dellink.inc.php

Fix serious deadlock feature. It was possible to link with no way to

2015-07-28 14:13:16 +02:00

actions_extrafields.inc.php

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

2015-07-19 12:26:31 +02:00

actions_fetchobject.inc.php

Fight against valign="top". Minor css fixes.

2015-05-14 16:47:15 +02:00

actions_lineupdown.inc.php

…

actions_printing.inc.php

…

actions_sendmails.inc.php

Work on tracking id into emails

2015-05-05 04:10:42 +02:00

actions_setnotes.inc.php

…

antispamimage.php

…

datepicker.php

…

doxygen.php

…

get_menudiv.php

Fix translation

2015-03-24 11:19:51 +01:00

index.html

…

photos_resize.php

NEW Can upload files on leave requests. Use more standard permissions.

2015-06-27 11:45:23 +02:00

search_page.php

Uniformize code for hooks

2015-06-22 15:48:48 +02:00

tools.php

…