Laurent Destailleur 6d0306f75a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ...

Conflicts:
	htdocs/core/class/html.formfile.class.php

2018-05-18 11:52:48 +02:00

..

accountancy

Merge pull request #8790 from aspangaro/7.0-f1

2018-05-18 11:20:05 +02:00

adherents

FIX CVE-2018-10095

2018-04-18 12:32:19 +02:00

admin

FIX CVE-2018-9019

2018-04-25 16:01:06 +02:00

api

…

asterisk

…

barcode

…

blockedlog

Fix: missing User object with API REST

2018-04-10 08:07:23 +02:00

bookmarks

…

cashdesk

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

2018-05-18 11:52:48 +02:00

categories

FIX sanitize setup params

2018-04-18 12:19:23 +02:00

collab

…

comm

Try better Fix for #8432

2018-04-06 13:20:09 +02:00

commande

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

2018-05-18 11:52:48 +02:00

compta

FIX #8722

2018-05-18 11:17:21 +02:00

conf

…

contact

Fix: zip not filter

2018-04-17 10:43:25 +02:00

contrat

FIX Error in ContractLigne not return to Contract

2018-04-23 15:07:50 +02:00

core

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

2018-05-18 11:52:48 +02:00

cron

Fix multicompany compatibility for recurring invoice generation

2018-04-16 14:18:38 +02:00

custom

…

don

…

ecm

…

expedition

…

expensereport

Backport EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS to solve blocking

2018-04-30 17:45:34 +02:00

exports

…

externalsite

…

fichinter

…

fourn

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

2018-05-05 14:34:54 +02:00

ftp

…

holiday

FIX Not approved holidays must not be visible into timesheet

2018-04-26 17:44:36 +02:00

hrm

…

imports

…

includes

…

install

Fix chart of account initial data for syscohada

2018-05-05 22:15:19 +02:00

langs

Fix translation of country for GB

2018-04-18 11:36:44 +02:00

livraison

…

loan

…

mailmanspip

…

margin

FIX sanitize setup params

2018-04-18 12:19:23 +02:00

modulebuilder

fix perms

2018-04-24 12:46:16 +02:00

multicurrency/class

…

opensurvey

…

paybox

…

paypal

…

printing

…

product

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

2018-05-05 13:25:00 +02:00

projet

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

2018-05-18 11:38:26 +02:00

public

Fix no lose entry when error on survey comment submission

2018-04-06 19:42:59 +02:00

resource

…

societe

Fix edit of capital

2018-04-30 11:01:33 +02:00

stripe

FIX #8580

2018-04-12 23:54:53 +02:00

supplier_proposal

FIX Projet is not prefilled when created from overwiew page

2018-05-01 14:15:11 +02:00

support

…

theme

Fix css to restore focus undertext on select2 combo lists

2018-04-13 10:01:07 +02:00

user

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

2018-04-11 14:45:11 +02:00

variants

Fix delete all product variants of a parent product

2018-05-02 22:33:23 +02:00

webservices

…

website

…

.gitignore

…

cache.manifest

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 7.0.3

2018-05-14 15:17:10 +02:00

index.php

…

main.inc.php

FIX DOL_AUTOSET_COOKIE was not correctly setting value of cookie

2018-04-19 13:54:43 +02:00

master.inc.php

…

robots.txt

…

viewimage.php

…