Philippe GRAND 69bf43f851 Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018

2018-09-12 14:48:50 +02:00

..

accountancy

fix merge

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

adherents

Standardize and update call to

2018-09-07 10:40:36 +02:00

admin

Standardize code for modulepart=mycompany like others modulepart.

2018-09-09 12:53:30 +02:00

api

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

2018-09-01 14:06:23 +02:00

asset

Merge branch 'develop' into develop

2018-09-04 16:58:59 +02:00

asterisk

…

barcode

…

blockedlog

Standardize and Update code

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

bookmarks

Merge branch 'develop' into develop

2018-09-04 16:58:59 +02:00

cashdesk

Standardize code for modulepart=mycompany like others modulepart.

2018-09-09 12:53:30 +02:00

categories

fix merge

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

collab

…

comm

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

2018-09-12 13:30:28 +02:00

commande

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

2018-09-12 13:30:28 +02:00

compta

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

2018-09-12 13:30:28 +02:00

conf

…

contact

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

2018-09-06 09:50:12 +02:00

contrat

Standardize and update code

2018-09-05 12:21:13 +02:00

core

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

2018-09-12 14:48:50 +02:00

cron

Standardize and update code

2018-09-05 12:21:13 +02:00

custom

…

dav

Update dav.class.php

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

don

Standardize and update code

2018-09-05 12:21:13 +02:00

ecm

Standardize and update code

2018-09-05 12:21:13 +02:00

expedition

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

2018-09-06 09:50:12 +02:00

expensereport

Standardize and update code

2018-09-05 12:21:13 +02:00

exports

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

2018-09-01 13:52:51 +02:00

externalsite

…

fichinter

Standardize and update code

2018-09-05 12:21:13 +02:00

fourn

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

2018-09-12 13:30:28 +02:00

ftp

…

holiday

Merge pull request #9420 from frederic34/patch-5

2018-09-07 19:32:36 +02:00

hrm

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

2018-09-04 21:35:43 +02:00

imports

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

2018-09-04 21:35:43 +02:00

includes

PSR2 FunctionClosingBrace

2018-08-29 21:25:22 +02:00

install

Add field twitter and facebook

2018-09-12 13:18:03 +02:00

langs

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

2018-09-12 13:30:28 +02:00

livraison

Standardize and update code

2018-09-02 11:08:41 +02:00

loan

Standardize and Update code

2018-09-01 22:55:10 +02:00

mailmanspip

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

2018-09-01 13:52:51 +02:00

margin

…

modulebuilder

Fix scrutinizer bug

2018-09-08 18:40:36 +02:00

multicurrency/class

conflict resolution

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

opensurvey

Standardize code for modulepart=mycompany like others modulepart.

2018-09-09 12:53:30 +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

Standardize code for modulepart=mycompany like others modulepart.

2018-09-09 12:53:30 +02:00

printing

…

product

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

2018-09-06 19:28:10 +02:00

projet

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

2018-09-12 13:30:28 +02:00

public

Fix generation of tpl

2018-09-10 23:37:51 +02:00

resource

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

2018-09-01 13:52:51 +02:00

societe

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

2018-09-12 13:30:28 +02:00

stripe

Merge branch 'develop' into develop

2018-09-04 16:58:59 +02:00

supplier_proposal

Standardize and update code

2018-09-02 11:08:41 +02:00

support

…

theme

Webiste

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

ticket

fix merge

2018-09-04 14:33:34 +02:00

user

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

2018-09-12 13:30:28 +02:00

variants

function Comment Missing

2018-08-31 21:39:23 +02:00

webservices

…

website

Fix import web site

2018-09-11 00:11:14 +02:00

.gitignore

…

cache.manifest

…

document.php

Standardize code for modulepart=mycompany like others modulepart.

2018-09-09 12:53:30 +02:00

favicon.ico

…

filefunc.inc.php

Prepare 8.0.2

2018-09-04 00:22:14 +02:00

index.php

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

2018-09-12 13:30:28 +02:00

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

Standardize code for modulepart=mycompany like others modulepart.

2018-09-09 12:53:30 +02:00