dolibarr/htdocs
Laurent Destailleur eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/members.lang
	htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +01:00
..
accountancy Merge pull request #10442 from aspangaro/10.0_accountancy_default 2019-01-30 16:30:13 +01:00
adherents Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-01 15:14:19 +01:00
admin Add tooltip on setup 2019-01-31 11:11:56 +01:00
api Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-30 16:44:08 +01:00
asset Move my email to the new one 2019-01-28 21:39:22 +01:00
asterisk
barcode
blockedlog Merge pull request #10428 from frederic34/toomanylines 2019-01-30 16:17:09 +01:00
bookmarks PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
cashdesk Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
categories Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
collab
comm Fix regression in look and feel (if empty, we do not sho value) 2019-01-30 15:31:39 +01:00
commande Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
compta Fix phpcs 2019-01-30 20:55:55 +01:00
conf
contact Move my email to the new one 2019-01-28 21:39:22 +01:00
contrat Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
core Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-01 15:14:19 +01:00
cron Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
custom
datapolicy
dav Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
don Move my email to the new one 2019-01-28 21:39:22 +01:00
ecm Merge pull request #10428 from frederic34/toomanylines 2019-01-30 16:17:09 +01:00
emailcollector Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
expedition Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-31 10:24:52 +01:00
expensereport Merge pull request #10428 from frederic34/toomanylines 2019-01-30 16:17:09 +01:00
exports Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
externalsite PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
fichinter Merge pull request #10428 from frederic34/toomanylines 2019-01-30 16:17:09 +01:00
fourn Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-30 16:54:38 +01:00
ftp Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
holiday Merge pull request #10428 from frederic34/toomanylines 2019-01-30 16:17:09 +01:00
hrm Move my email to the new one 2019-01-28 21:39:22 +01:00
imports Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
includes NEW Introduce PhpSpreadsheet for export (need php5.6+) 2019-01-21 14:06:01 +01:00
install Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-01 15:14:19 +01:00
langs Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-01 15:14:19 +01:00
livraison Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-31 10:24:52 +01:00
loan Merge pull request #10428 from frederic34/toomanylines 2019-01-30 16:17:09 +01:00
mailmanspip Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
margin Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 16:48:33 +01:00
modulebuilder Merge pull request #10428 from frederic34/toomanylines 2019-01-30 16:17:09 +01:00
multicurrency/class Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
opensurvey Move my email to the new one 2019-01-28 21:39:22 +01:00
paybox Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
paypal Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
printing
product Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-30 16:54:38 +01:00
projet Work on billing projects 2019-01-30 20:02:41 +01:00
public Merge pull request #10428 from frederic34/toomanylines 2019-01-30 16:17:09 +01:00
reception Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
resource Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
societe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-30 16:54:38 +01:00
stripe Merge pull request #10428 from frederic34/toomanylines 2019-01-30 16:17:09 +01:00
supplier_proposal Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
support Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
takepos Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-27 18:27:58 +01:00
theme Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-01 15:14:19 +01:00
ticket Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
user Move my email to the new one 2019-01-28 21:39:22 +01:00
variants PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
webservices Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
website Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
.gitignore
cache.manifest
document.php FIX XSS 2019-01-31 10:18:06 +01:00
favicon.ico
filefunc.inc.php Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
index.php Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
main.inc.php Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
master.inc.php Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
robots.txt
viewimage.php FIX XSS 2019-01-31 10:18:06 +01:00