Frédéric FRANCE 65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

..

accountancy

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

adherents

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

admin

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-02 18:19:45 +02:00

api

move phpcs:ignore

2018-09-02 13:38:11 +02:00

asset

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

asterisk

…

barcode

…

blockedlog

Standardize and Update code

2018-09-01 23:04:46 +02:00

bookmarks

fix merge

2018-09-04 14:49:56 +02:00

cashdesk

Standardize and Update code

2018-09-01 23:04:46 +02:00

categories

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

collab

…

comm

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

commande

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

compta

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

conf

…

contact

move phpcs:ignore

2018-09-02 22:05:19 +02:00

contrat

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

core

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

cron

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

custom

…

dav

Update dav.class.php

2018-09-01 15:27:51 +02:00

don

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

ecm

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

expedition

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

expensereport

move phpcs:ignore

2018-09-02 18:49:23 +02:00

exports

move phpcs:ignore

2018-09-02 18:18:10 +02:00

externalsite

…

fichinter

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

fourn

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

ftp

…

holiday

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

hrm

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

imports

move phpcs:ignore

2018-09-02 09:57:19 +02:00

includes

…

install

NEW Close #9296 Add field ref_ext into llx_categorie

2018-09-04 11:29:52 +02:00

langs

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

2018-09-02 15:48:26 +02:00

livraison

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

loan

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

mailmanspip

move phpcs:ignore

2018-09-02 22:05:19 +02:00

margin

…

modulebuilder

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

multicurrency/class

conflict resolution

2018-09-01 12:38:22 +02:00

opensurvey

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

paybox

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

2018-09-02 15:48:26 +02:00

paypal

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

2018-09-02 15:48:26 +02:00

printing

…

product

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

projet

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

public

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

2018-09-03 14:06:51 +02:00

resource

move phpcs:ignore

2018-09-02 20:37:12 +02:00

societe

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

stripe

Standardize and update code

2018-09-04 13:37:00 +02:00

supplier_proposal

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

support

…

theme

…

ticket

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

user

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

variants

…

webservices

…

website

Merge remote-tracking branch 'upstream/develop' into camelCaps2

2018-09-04 20:48:35 +02:00

.gitignore

…

cache.manifest

…

document.php

…

favicon.ico

…

filefunc.inc.php

…

index.php

…

main.inc.php

FIX remove deprecated triggers USER_LOG*

2018-09-03 09:30:36 +02:00

master.inc.php

Fix all TODO in main and master files

2018-09-02 16:47:58 +02:00

robots.txt

…

viewimage.php

…