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

Conflicts:
	htdocs/filefunc.inc.php

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

..

accountancy

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

2017-02-21 10:34:52 +01:00

adherents

Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms

2017-02-21 14:17:44 +01:00

admin

Merge branch 'develop' into NEW_pdf_supplier_payment

2017-02-22 14:20:47 +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

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

Fix css and look 5.0

2017-01-22 12:13:32 +01:00

comm

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

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

commande

Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms

2017-02-21 14:17:44 +01:00

compta

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

2017-02-23 02:55:50 +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 MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms

2017-02-21 14:17:44 +01:00

core

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

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

cron

Fix responsive

2017-01-17 20:04:41 +01:00

custom

…

don

Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms

2017-02-21 14:17:44 +01:00

ecm

Remove useless line that show "root" in EDM module.

2017-02-23 01:00:44 +01:00

expedition

Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms

2017-02-21 14:17:44 +01:00

expensereport

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

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

exports

NEW Introduce fields that can be computed during export in export

2017-02-17 00:19:28 +01:00

externalsite

…

fichinter

Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms

2017-02-21 14:17:44 +01:00

fourn

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

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

ftp

…

holiday

Fix loading lang

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

hrm

Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms

2017-02-21 14:17:44 +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

NEW Upgrade jquery to 3.3.1 and jquery-ui to 1.12

2017-02-23 00:46:19 +01:00

install

Merge branch 'develop' into NEW_pdf_supplier_payment

2017-02-22 14:20:47 +01:00

langs

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

2017-02-23 02:55:50 +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

Fix responsive design

2016-11-25 18:32:52 +01:00

paypal

Fix responsive design

2016-11-25 18:32:52 +01:00

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-02-23 02:55:50 +01:00

projet

Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms

2017-02-21 14:17:44 +01:00

public

Debug module variant

2017-02-08 12:52:31 +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

Several fix for a better management of #6424

2017-02-22 17:46:54 +01:00

supplier_proposal

Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms

2017-02-21 14:17:44 +01:00

support

Clean admin menu entries

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

theme

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

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

user

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

2017-02-23 02:55:50 +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

NEW Show subtotal into list of linked elements

2016-11-08 19:19:30 +01:00

cache.manifest

Fix missing translation of page "disabled" and "offline".

2016-12-02 17:49:39 +01:00

document.php

Code comment

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

favicon.ico

…

filefunc.inc.php

Prepare final 5.0

2017-02-21 12:03:08 +01:00

index.php

NEW Move login information on home page into a widget

2017-02-21 11:57:52 +01:00

main.inc.php

Fix js errors

2017-02-23 02:51:26 +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

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

2016-11-11 15:03:05 +01:00