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

Conflicts:
	htdocs/admin/tools/update.php

2017-02-16 22:09:37 +01:00

..

accountancy

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

2017-02-10 17:34:23 +01:00

adherents

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

2017-02-10 17:34:23 +01:00

admin

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

2017-02-16 22:09:37 +01:00

api

Fix #6365

2017-02-03 11:42:49 +01:00

asterisk

…

barcode

…

bookmarks

Merge branch 'develop' into develop

2017-01-27 01:46:21 +01:00

cashdesk

Merge pull request #6408 from gnovaro/patch-6

2017-02-12 20:41:55 +01:00

categories

…

comm

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

2017-02-10 17:34:23 +01:00

commande

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

2017-02-16 22:09:37 +01:00

compta

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

2017-02-10 17:34:23 +01:00

conf

…

contact

Code style

2017-02-08 17:13:54 -03:00

contrat

Merge branch 'develop' into prod-attr

2017-02-02 20:07:41 +01:00

core

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

2017-02-16 22:09:37 +01:00

cron

…

custom

…

don

Fix regression: Textarea to enter data was crushed.

2017-02-07 01:13:04 +01:00

ecm

Removed useless table-tr-td

2017-02-04 11:32:26 +01:00

expedition

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

2017-02-16 22:09:37 +01:00

expensereport

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

2017-02-16 22:09:37 +01:00

exports

Fix bad syntax into criteria to filter on date in export.

2017-02-08 10:45:20 +01:00

externalsite

…

fichinter

Little correction

2017-02-03 20:12:26 +01:00

fourn

Merge pull request #6409 from IonAgorria/supplierorder-oldline

2017-02-12 20:45:20 +01:00

ftp

…

holiday

Fix loading lang

2017-01-23 17:36:50 +01:00

hrm

…

imports

…

includes

Default usage to send token is header.

2017-02-03 12:16:13 +01:00

install

Merge pull request #6397 from apachler/develop

2017-02-08 16:47:40 +01:00

langs

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

2017-02-13 01:36:02 +01:00

livraison

…

loan

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

2017-01-22 12:14:18 +01:00

mailmanspip

…

margin

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

2017-01-28 15:12:14 +01:00

multicurrency/class

…

opensurvey

…

paybox

…

paypal

…

printing

…

product

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

2017-02-10 17:34:23 +01:00

projet

NEW Add option PROJECT_THIRDPARTY_REQUIRED

2017-02-15 18:09:45 +01:00

public

Debug module variant

2017-02-08 12:52:31 +01:00

resource

fix extrafield list of fileds

2017-01-26 15:44:09 +01:00

societe

$db attributte now be protected

2017-02-08 20:27:14 -03:00

supplier_proposal

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

2017-01-22 12:14:18 +01:00

support

…

theme

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

2017-02-16 22:09:37 +01:00

user

Debug of feature for browser notifications

2017-02-14 18:20:01 +01:00

variants

Optimize code and performance of module variant

2017-02-08 14:07:54 +01:00

webservices

…

websites

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

2017-01-22 12:14:18 +01:00

.gitignore

…

cache.manifest

…

document.php

…

favicon.ico

…

filefunc.inc.php

Fix fields into projet export

2017-01-26 10:41:02 +01:00

index.php

Merge branch 'new_link_weather_board' of

2017-02-06 20:51:46 +01:00

main.inc.php

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

2017-02-16 22:09:37 +01:00

master.inc.php

…

robots.txt

…

viewimage.php

…