Laurent Destailleur cd5e43483e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ...

Conflicts:
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/expedition/card.php
	htdocs/projet/class/task.class.php

2017-10-28 22:08:16 +02:00

..

accountancy

fix accountancy index display

2017-10-23 10:00:22 +02:00

adherents

Fix perm to delete files

2017-10-18 17:21:30 +02:00

admin

Wrong test

2017-10-11 11:49:46 +02:00

api

Fix init of environment for a dedicated entity in API

2017-10-19 17:32:23 +02:00

asterisk

…

barcode

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

2017-06-09 12:50:56 +02:00

blockedlog

agin fix blockedlog on supplier incvoive payument

2017-10-26 12:13:47 +02:00

bookmarks

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

cashdesk

Fix responsive

2017-06-13 20:07:28 +02:00

categories

Fix count into loop

2017-09-14 21:35:14 +02:00

collab

Debug module website

2017-07-03 12:04:45 +02:00

comm

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

2017-10-28 22:08:16 +02:00

commande

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

2017-10-26 17:02:40 +02:00

compta

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

2017-10-26 17:02:40 +02:00

conf

…

contact

Fix: missing parameters for filter and sort (contact list)

2017-09-09 09:46:21 +02:00

contrat

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

2017-10-28 22:08:16 +02:00

core

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

2017-10-28 22:08:16 +02:00

cron

Fix filter on extrafield with type sellist

2017-09-07 15:34:25 +02:00

custom

…

don

Fix perm to delete files

2017-10-18 17:21:30 +02:00

ecm

Fix pb in ecm

2017-08-01 18:44:34 +02:00

expedition

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

2017-10-28 22:08:16 +02:00

expensereport

Fix perm to delete files

2017-10-18 17:21:30 +02:00

exports

Fix better management of export of extrafield computed.

2017-06-13 18:50:31 +02:00

externalsite

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

2017-06-18 21:13:48 +02:00

fichinter

Fix perm to delete files

2017-10-18 17:21:30 +02:00

fourn

Merge pull request #7715 from grandoc/new_branch_26_10_17

2017-10-27 02:18:26 +02:00

ftp

…

holiday

Allow : into file names

2017-10-03 10:54:51 +02:00

hrm

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

imports

…

includes

FIX #7420

2017-09-18 15:49:21 +02:00

install

Fix missing field in migration v6

2017-10-23 10:22:45 +02:00

langs

FIX #7593

2017-10-13 01:03:33 +02:00

livraison

Fix perm to delete files

2017-10-18 17:21:30 +02:00

loan

Fix missing $form

2017-08-22 10:02:45 +02:00

mailmanspip

…

margin

Fix data for supplier must be not visible if supplier module off

2017-10-27 01:46:54 +02:00

modulebuilder

Fix perm to delete files

2017-10-18 17:21:30 +02:00

multicurrency/class

…

opensurvey

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

paybox

…

paypal

…

printing

…

product

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

2017-10-26 17:02:40 +02:00

projet

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

2017-10-27 02:32:09 +02:00

public

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

2017-09-15 11:02:34 +02:00

resource

agin fix list ressource

2017-09-21 12:02:45 +02:00

societe

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

2017-10-28 22:08:16 +02:00

stripe

Fix: Stripe not working on live mode

2017-09-21 12:06:43 +02:00

supplier_proposal

FIX make of link to other object during creation

2017-10-19 19:06:48 +02:00

support

Fix link http

2017-08-21 20:49:12 +02:00

theme

Merge pull request #7640 from atm-florian/6.0_fixeventiconstatus

2017-10-19 19:18:56 +02:00

user

Fix perm to delete files

2017-10-18 17:21:30 +02:00

variants

Fix travis error

2017-08-01 01:28:07 +02:00

webservices

FIX #7265

2017-08-23 12:47:59 +02:00

websites

Revert "Fix include fails"

2017-07-28 12:07:05 +02:00

.gitignore

…

cache.manifest

…

document.php

FIX Security fixes (filter onload js, less verbose error message in

2017-09-06 11:39:30 +02:00

favicon.ico

…

filefunc.inc.php

Prepare 6.0.3

2017-10-08 19:46:24 +02:00

index.php

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

2017-10-22 01:30:25 +02:00

main.inc.php

FIX Security fixes (filter onload js, less verbose error message in

2017-09-06 11:39:30 +02:00

master.inc.php

Fix too much code into the NOREQUIREDB

2017-07-02 13:18:23 +02:00

robots.txt

…

viewimage.php

FIX Security fixes (filter onload js, less verbose error message in

2017-09-06 11:39:30 +02:00