dolibarr/htdocs
Laurent Destailleur c36c8ed447 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
2020-06-17 15:28:19 +02:00
..
accountancy Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 15:28:19 +02:00
adherents Merge pull request #14032 from ptibogxiv/patch-343 2020-06-12 00:47:55 +02:00
admin NEW hide closed contract lines 2020-06-16 10:45:49 +02:00
api Fix phpcs 2020-06-16 22:48:19 +02:00
asset Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 14:28:20 +02:00
asterisk add new rule 2020-05-21 09:35:30 +02:00
barcode Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-03 01:06:27 +02:00
blockedlog Fix for use with text browser 2020-06-10 12:46:55 +02:00
bom Fix for use with text browser 2020-06-10 12:46:55 +02:00
bookmarks Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 23:07:18 +02:00
cashdesk Prepare convertion of field "montant" into "amount" 2020-06-17 12:45:56 +02:00
categories NEW Add param to not show links when output tags 2020-06-16 02:56:48 +02:00
collab add new rule 2020-05-21 15:05:19 +02:00
comm Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
commande Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-03 01:06:27 +02:00
compta Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 15:28:19 +02:00
conf
contact Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 23:04:55 +02:00
contrat Fixing style errors. 2020-06-16 08:54:50 +00:00
core Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 15:28:19 +02:00
cron add new rule 2020-05-21 15:05:19 +02:00
custom
datapolicy Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
dav add new rule 2020-05-21 15:05:19 +02:00
debugbar Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 23:38:46 +02:00
don add new rule 2020-05-21 15:05:19 +02:00
ecm Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 14:36:11 +02:00
emailcollector add new rule 2020-05-21 15:05:19 +02:00
expedition Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
expensereport Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
exports add new rule 2020-05-21 15:05:19 +02:00
externalsite add new rule 2020-05-21 15:05:19 +02:00
fichinter Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-31 00:31:14 +02:00
fourn Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 15:28:19 +02:00
ftp add new rule 2020-05-21 15:05:19 +02:00
holiday Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
hrm Debug establishment management 2020-05-29 21:45:50 +02:00
imports Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-31 00:31:14 +02:00
includes fix : personnal font file within tcpdf 2020-05-23 15:01:40 +02:00
install Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:42:07 +02:00
langs Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 15:28:19 +02:00
livraison add new rule 2020-05-21 15:05:19 +02:00
loan Fixing style errors. 2020-06-13 07:44:48 +00:00
mailmanspip add new rule 2020-05-21 15:05:19 +02:00
margin add new rule 2020-05-21 15:05:19 +02:00
modulebuilder Merge pull request #14006 from bafbes/abb110215 2020-06-11 23:15:52 +02:00
mrp Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-09 22:09:57 +02:00
multicurrency/class Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 21:36:08 +02:00
opensurvey phpcs 2020-05-28 20:04:30 +02:00
paybox add new rule 2020-05-21 15:05:19 +02:00
paypal add new rule 2020-05-21 15:05:19 +02:00
printing add new rule 2020-05-21 15:05:19 +02:00
product Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:44:38 +02:00
projet Fix phpcs 2020-06-11 13:03:21 +02:00
public Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 19:37:27 +02:00
reception add new rule 2020-05-21 15:05:19 +02:00
resource add new rule 2020-05-21 15:05:19 +02:00
salaries add new rule 2020-05-21 15:05:19 +02:00
societe Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-11 23:41:35 +02:00
stripe add new rule 2020-05-21 15:05:19 +02:00
supplier_proposal Fixing style errors. 2020-05-25 22:33:02 +00:00
support add new rule 2020-05-21 15:05:19 +02:00
takepos FIX replace filter parameter "none" by "restricthtml" 2020-06-08 11:48:31 +02:00
theme css 2020-06-16 17:55:46 +02:00
ticket Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-11 23:41:35 +02:00
user Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 23:04:55 +02:00
variants Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
webservices Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 21:36:08 +02:00
website Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 19:37:27 +02:00
zapier add new rule 2020-05-21 09:12:18 +02:00
.gitignore
cache.manifest Fix use SVG logo instead of PNG 2020-05-15 12:43:48 +02:00
document.php add new rule 2020-05-21 15:13:31 +02:00
favicon.ico
filefunc.inc.php Prepare v12 2020-06-06 22:52:36 +02:00
index.php Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-07 19:55:48 +02:00
main.inc.php Fix for use with text browser 2020-06-10 12:46:55 +02:00
master.inc.php add new rule 2020-05-21 15:05:19 +02:00
opcachepreload.php
robots.txt
viewimage.php add new rule 2020-05-21 15:13:31 +02:00