dolibarr/htdocs
Laurent Destailleur b710e28ffa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/admin/adherent.php
	htdocs/admin/barcode.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/admin.lang
2019-03-09 01:20:13 +01:00
..
accountancy replace html by html5 in accountancy 2019-03-03 10:31:46 +01:00
adherents Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 01:20:13 +01:00
admin Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 01:20:13 +01:00
api change visibility 2019-03-04 19:57:46 +01:00
asset wip 2019-02-25 21:36:27 +01:00
asterisk PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
barcode PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
blockedlog add visibility 2019-03-02 00:14:22 +01:00
bom Update bom_card.php 2019-03-06 19:05:13 +01:00
bookmarks wip 2019-02-25 21:36:27 +01:00
cashdesk add visibility 2019-03-02 00:14:22 +01:00
categories add oldcopy of category before updating 2019-03-06 18:01:18 +01:00
collab PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
comm Merge pull request #10753 from OPEN-DSI/fix-comm-action-contactid 2019-03-07 13:12:22 +01:00
commande Fix API explorer was broken due to corrupted API 2019-03-06 18:04:36 +01:00
compta Merge pull request #10776 from frederic34/patch-3 2019-03-08 19:38:44 +01:00
conf
contact Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
contrat Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 01:20:13 +01:00
core Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 01:20:13 +01:00
cron Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-28 20:48:23 +01:00
custom
datapolicy Scrutinizer Auto-Fixes 2019-03-09 00:02:05 +00:00
dav wip 2019-02-26 00:02:39 +01:00
don change visibility 2019-03-04 19:57:46 +01:00
ecm wip 2019-02-26 00:02:39 +01:00
emailcollector wip syntax error 2019-02-25 23:29:46 +01:00
expedition change visibility 2019-03-04 19:57:46 +01:00
expensereport Try to fix error on pgsql 2019-03-08 20:06:09 +01:00
exports Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-07 14:13:38 +01:00
externalsite Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
fichinter Fix bad var name 2019-03-09 01:13:15 +01:00
fourn replace html by html5 in fourn 2019-03-07 20:46:38 +01:00
ftp Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
holiday NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00
hrm add visibility 2019-03-01 23:08:57 +01:00
ifttt WIP Add IFTTT module 2019-02-28 10:30:27 +01:00
imports Fix responsive 2019-03-04 10:42:09 +01:00
includes autoloader for egulias lib needed by swiftmailer 2019-03-02 14:35:05 +01:00
install NEW Show the latest date of subscription in member statistics reports 2019-03-07 12:22:24 +01:00
langs Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 01:20:13 +01:00
livraison replace html by html5 in livraison 2019-03-03 09:10:26 +01:00
loan Scrutinizer Auto-Fixes 2019-03-09 00:02:05 +00:00
mailmanspip add visibility 2019-03-02 00:14:22 +01:00
margin Merge pull request #10736 from OPEN-DSI/fix-margin-agents3 2019-03-07 20:45:40 +01:00
modulebuilder Merge pull request #10748 from frederic34/patch-2 2019-03-07 12:31:09 +01:00
multicurrency/class add visibility 2019-03-01 23:08:57 +01:00
opensurvey add visibility 2019-03-01 23:08:57 +01:00
paybox Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
paypal Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
printing PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
product Fix var not used 2019-03-09 01:08:50 +01:00
projet Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 01:20:13 +01:00
public Debug module ticket 2019-03-04 19:19:09 +01:00
reception Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
resource Dolibarize module ticket 2019-03-05 12:18:46 +01:00
societe change visibility 2019-03-04 19:57:46 +01:00
stripe add visibility 2019-03-01 23:08:57 +01:00
supplier_proposal change visibility 2019-03-04 19:57:46 +01:00
support Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
takepos Add Order Notes to TakePOS 2019-03-03 12:50:36 +01:00
theme Merge pull request #10758 from altatof/lf 2019-03-07 14:18:26 +01:00
ticket Merge pull request #10739 from frederic34/patch-3 2019-03-05 18:43:36 +01:00
user change visibility 2019-03-04 19:57:46 +01:00
variants Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
webservices Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2019-02-13 09:23:52 +01:00
website NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00
.gitignore remove specific entry in gitignore 2019-03-06 16:50:28 +01:00
cache.manifest
document.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-31 18:27:27 +01:00
favicon.ico
filefunc.inc.php Prepare version 9.0.2 2019-03-07 10:57:15 +01:00
index.php NEW Gain space by moving the meteo on title line 2019-02-20 06:01:13 +01:00
main.inc.php Update main.inc.php 2019-03-04 23:47:40 +01:00
master.inc.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
robots.txt
viewimage.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-31 18:27:27 +01:00