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

Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/core/lib/functions.lib.php

2018-01-14 03:15:49 +01:00

..

accountancy

Clean var

2018-01-12 14:57:02 +01:00

adherents

Fix scrutinizer bug

2018-01-12 15:20:17 +01:00

admin

Responsive and css

2018-01-12 01:10:03 +01:00

api

Merge #8008 manually

2018-01-04 23:36:14 +01:00

asterisk

…

barcode

Better name for generated page of barcodes

2017-11-24 09:30:21 +01:00

blockedlog

Fix lose filters

2018-01-12 20:32:30 +01:00

bookmarks

Fix badge and use of data-html instead of html tag

2017-12-10 15:46:35 +01:00

cashdesk

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

2017-12-21 14:35:33 +01:00

categories

Fix maxi debug of APIs (clean output fields)

2017-12-21 16:50:18 +01:00

collab

Clean translation files

2017-11-03 14:38:00 +01:00

comm

Fix conditions of some fields

2018-01-13 17:21:56 +01:00

commande

Fix css

2018-01-13 12:08:24 +01:00

compta

Fix colspan

2018-01-13 16:06:04 +01:00

conf

…

contact

Fix regression

2018-01-11 20:39:23 +01:00

contrat

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

2017-12-28 09:56:40 +01:00

core

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

2018-01-14 03:15:49 +01:00

cron

factorization of extrafeild into list

2017-11-27 15:24:29 +01:00

custom

…

don

Fix scrutinizer

2018-01-12 15:26:50 +01:00

ecm

Fix rename of dir from filemanager

2018-01-07 19:38:20 +01:00

expedition

Fix conditions of some fields

2018-01-13 17:21:56 +01:00

expensereport

Fix maxi debug of APIs (clean output fields)

2017-12-21 16:50:18 +01:00

exports

Fix duplicate instructions

2018-01-03 14:46:18 +01:00

externalsite

Fix substition for menus title and urls

2017-12-09 15:35:01 +01:00

fichinter

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

2018-01-11 01:14:20 +01:00

fourn

Fix name of file saved from tax document tab

2018-01-12 17:39:20 +01:00

ftp

…

holiday

Fix on search all (trim search + search from smartphone).

2017-12-12 11:31:30 +01:00

hrm

Clean code

2017-11-11 01:10:17 +01:00

imports

Fix duplicate instructions

2018-01-03 14:46:18 +01:00

includes

Css use roboto but files does not exists

2017-12-22 12:56:29 +01:00

install

Fix field enabled and perms must differs

2018-01-13 13:16:33 +01:00

langs

Fix blockedlog. Browser can be used with large amount of events

2018-01-12 20:24:09 +01:00

livraison

Error management after extrafield update

2017-10-24 19:04:40 +02:00

loan

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

2017-12-28 09:56:40 +01:00

mailmanspip

…

margin

Fix responsive and search

2017-12-01 12:01:17 +01:00

modulebuilder

Fix field enabled and perms must differs

2018-01-13 13:16:33 +01:00

multicurrency/class

…

opensurvey

Fix warning on late surveys

2017-11-24 10:06:42 +01:00

paybox

…

paypal

Try to introduce param forcesandbox to test online payment easier

2017-10-28 16:32:19 +02:00

printing

Fix setup of direct print with google docs driver

2017-11-27 13:55:27 +01:00

product

Fix scrutinizer

2018-01-12 15:38:53 +01:00

projet

Fix conditions of some fields

2018-01-13 17:21:56 +01:00

public

Fix conditions of some fields

2018-01-13 17:21:56 +01:00

resource

factorization of extrafeild into list

2017-11-27 15:24:29 +01:00

societe

Fix regression

2018-01-11 10:20:49 +01:00

stripe

Try to introduce param forcesandbox to test online payment easier

2017-10-28 16:32:19 +02:00

supplier_proposal

Try fix for #7778

2018-01-05 01:43:51 +01:00

support

…

theme

Responsive and css

2018-01-12 01:10:03 +01:00

user

Fix maxi debug of APIs (clean output fields)

2017-12-21 16:50:18 +01:00

variants

Fix responsive

2017-12-01 12:55:28 +01:00

webservices

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

2017-12-20 13:28:41 +01:00

website

Fix example

2018-01-08 12:41:22 +01:00

.gitignore

…

cache.manifest

…

document.php

Fix module website

2018-01-02 22:58:37 +01:00

favicon.ico

…

filefunc.inc.php

Prepare 6.0.5

2017-12-05 11:54:26 +01:00

index.php

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

2017-12-11 15:25:09 +01:00

main.inc.php

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

2018-01-04 19:30:25 +01:00

master.inc.php

Fix constant MAIN_LANG_DEFAULT not used

2017-12-19 00:24:38 +01:00

robots.txt

…

viewimage.php

…