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

Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php

2017-03-19 11:26:49 +01:00

..

accountancy

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

2017-03-19 11:26:49 +01:00

adherents

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

2017-03-19 11:26:49 +01:00

admin

Merge branch 'develop' into NEW_odt_others_objects

2017-03-14 10:44:05 +01:00

api

Fix #6365

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

asterisk

FIX security bugs

2016-12-18 13:24:06 +01:00

barcode

…

bookmarks

NEW Can use dol_fiche_end without showing bottom border.

2017-03-15 11:13:30 +01:00

cashdesk

Merge pull request #6408 from gnovaro/patch-6

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

categories

FIX #6535

2017-03-16 22:49:02 +01:00

comm

NEW Can use dol_fiche_end without showing bottom border.

2017-03-15 11:13:30 +01:00

commande

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

2017-03-19 11:26:49 +01:00

compta

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

2017-03-19 11:26:49 +01:00

conf

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

2016-12-26 12:42:23 +01:00

contact

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

2017-02-23 02:55:50 +01:00

contrat

Add fin_validite, date_cloture in fetch

2017-03-15 21:31:44 +01:00

core

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

2017-03-19 11:26:49 +01:00

cron

Fix parameters

2017-02-27 00:22:11 +01:00

custom

…

don

Merge pull request #6492 from aspangaro/6.0-donation

2017-03-10 12:31:46 +01:00

ecm

Uniformize look and feels

2017-03-07 18:34:57 +01:00

expedition

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

2017-03-19 11:26:49 +01:00

expensereport

PHP code to manage pair/impair is replaced by native CSS.

2017-03-07 22:45:22 +01:00

exports

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

2017-03-19 11:26:49 +01:00

externalsite

…

fichinter

PHP code to manage pair/impair is replaced by native CSS.

2017-03-07 22:45:22 +01:00

fourn

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

2017-03-19 11:26:49 +01:00

ftp

…

holiday

Fix loading lang

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

hrm

Fix closing boxes

2017-03-15 11:58:13 +01:00

imports

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

2016-12-11 16:20:46 +01:00

includes

Try jSignature

2017-03-03 15:26:51 +01:00

install

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

2017-03-19 11:26:49 +01:00

langs

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

2017-03-19 11:26:49 +01:00

livraison

In case Model for document generation is not defined, the criteria to select the model is now:

2017-01-16 21:16:05 +01:00

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

Fix missing default value for new parameter

2016-12-11 21:15:24 +01:00

opensurvey

Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on

2017-01-15 20:49:20 +01:00

paybox

…

paypal

…

printing

Fix several problems into OAuth2 module.

2017-01-06 19:58:46 +01:00

product

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

2017-03-19 11:26:49 +01:00

projet

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

2017-03-19 11:26:49 +01:00

public

Work on module website

2017-02-24 21:13:40 +01:00

resource

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

2017-02-23 02:55:50 +01:00

societe

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

2017-03-19 11:26:49 +01:00

supplier_proposal

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

2017-03-19 11:26:49 +01:00

support

Clean admin menu entries

2017-02-22 02:19:50 +01:00

theme

Minor look enhancement

2017-03-16 17:02:30 +01:00

user

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

2017-03-19 11:26:49 +01:00

variants

Uniformize code

2017-03-12 17:10:32 +01:00

webservices

…

websites

Work on module website

2017-02-24 21:13:40 +01:00

.gitignore

…

cache.manifest

…

document.php

Code comment

2016-12-12 15:41:31 +01:00

favicon.ico

…

filefunc.inc.php

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

2017-03-19 11:26:49 +01:00

index.php

Fix CSS

2017-03-14 14:33:25 +01:00

main.inc.php

Work on module website

2017-02-24 21:13:40 +01:00

master.inc.php

FIX Security to restrict email sending was not efficient

2016-12-16 13:46:39 +01:00

robots.txt

…

viewimage.php

…