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

..

accountancy

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

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

adherents

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

2015-07-28 18:57:13 +02:00

admin

Fix timezone problem with external calendar import.

2015-07-28 18:12:45 +02:00

api

…

asterisk

…

barcode

NEW Can add project search on left menu search area

2015-06-22 11:55:21 +02:00

bookmarks

Fix: print_liste_field_titre('');

2015-06-26 06:23:29 +02:00

cashdesk

Fix bad parameters of function select_date

2015-07-12 12:50:24 +02:00

categories

Tags are shown as thumbs into card.

2015-06-22 22:31:44 +02:00

comm

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

2015-08-01 14:50:07 +02:00

commande

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

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

compta

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

2015-08-01 14:50:07 +02:00

conf

…

contact

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

2015-07-21 10:49:47 +02:00

contrat

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

2015-07-28 18:57:13 +02:00

core

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

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

cron

Fix: print_liste_field_titre('');

2015-06-26 06:23:29 +02:00

custom

…

don

Fix: Show project link

2015-07-15 21:55:09 +02:00

ecm

Merge remote-tracking branch 'Upstream/3.8' into 3.8-1

2015-07-16 12:25:37 +02:00

expedition

fix #3338 broken links on shippment card

2015-08-07 09:27:46 +02:00

expensereport

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

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

exports

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

2015-06-29 00:09:28 +02:00

externalsite

…

fichinter

FIX: Missing interventions headers

2015-07-29 13:04:12 +02:00

fourn

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

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

ftp

…

holiday

Fix: #3230 [Leaves] Module setup page is useless

2015-07-16 22:29:04 +02:00

imports

NEW: Add help tooltips on fields of dictionary edit pages.

2015-07-04 02:08:06 +02:00

includes

NEW : upgrade jQuery Component Datable (and extras) to 1.10.7

2015-07-20 08:41:18 +02:00

install

Fix not compatible not supported option

2015-07-28 10:05:48 +02:00

langs

Fix #3236

2015-08-07 10:12:10 +02:00

livraison

…

loan

Move my address email to new one

2015-07-15 20:30:33 +02:00

mailmanspip

…

margin

Fix PHPCS

2015-07-28 18:33:43 +02:00

opensurvey

Fix: Opensurvey show description in view mode without fckeditor

2015-07-16 05:33:51 +02:00

paybox

Sync with transifex

2015-07-20 13:55:43 +02:00

paypal

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

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

printing

Fix #3236

2015-08-07 10:12:10 +02:00

product

Fix #3217 [Stocks] Warehouse list shows SQL request

2015-08-01 14:29:32 +02:00

projet

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

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

public

add test on test arrays with show/hide column

2015-07-21 09:38:43 +02:00

resource

Move my address email to new one

2015-07-15 20:30:33 +02:00

societe

FIX : Error management in societe/soc.php

2015-08-03 11:39:24 +02:00

support

Fix travis

2015-06-24 07:01:15 +02:00

theme

Fix: css on current day

2015-07-21 12:30:12 +02:00

user

Fix timezone problem with external calendar import.

2015-07-28 18:12:45 +02:00

webservices

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

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

.gitignore

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

2015-07-21 00:17:11 +02:00

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 3.8

2015-07-12 23:44:35 +02:00

index.php

…

main.inc.php

FIX : if multicompany enabled, call to undifend method _setCookie

2015-07-27 22:08:33 +02:00

master.inc.php

…

robots.txt

…

viewimage.php

…