dolibarr/htdocs
Laurent Destailleur 22d4f37e58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/class/html.form.class.php
2020-01-10 14:31:37 +01:00
..
accountancy Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2020-01-10 14:31:37 +01:00
adherents FIX Do not record resource owner of event when not defined. 2020-01-01 12:47:01 +01:00
admin Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00
api
asset
asterisk
barcode Update codeinit.php 2020-01-10 00:07:26 +01:00
blockedlog
bom Fix bad link 2020-01-09 22:42:31 +01:00
bookmarks
cashdesk fix undefined facid 2019-12-31 17:24:27 +01:00
categories Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 14:16:34 +01:00
collab
comm Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-10 14:30:42 +01:00
commande Fix delay and useless code 2019-12-21 14:35:39 +01:00
compta Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-10 14:30:42 +01:00
conf
contact doxygen 2020-01-07 10:54:19 +01:00
contrat
core Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2020-01-10 14:31:37 +01:00
cron
custom
datapolicy
dav
debugbar
don
ecm
emailcollector
expedition Fix phpcs 2019-12-23 15:51:23 +01:00
expensereport FIX #12709 2019-12-20 17:06:32 +01:00
exports Debug v11 2019-12-23 12:24:27 +01:00
externalsite
fichinter
fourn Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-10 14:30:42 +01:00
ftp
holiday
hrm
imports Look and feel v11 2019-12-23 13:02:30 +01:00
includes Update odf.php 2020-01-10 00:26:46 +01:00
install Merge pull request #12792 from aspangaro/12.0_a5 2020-01-10 00:23:54 +01:00
langs Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-10 14:30:42 +01:00
livraison
loan Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-04 14:20:25 +01:00
mailmanspip
margin Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2019-12-23 14:13:26 +01:00
modulebuilder Scrutinizer Auto-Fixes 2020-01-09 23:02:05 +00:00
mrp Scrutinizer Auto-Fixes 2020-01-09 23:03:10 +00:00
multicurrency/class
opensurvey Update choix_date.php 2020-01-10 00:25:46 +01:00
paybox
paypal
printing
product Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-10 14:30:42 +01:00
projet Scrutinizer Auto-Fixes 2020-01-09 23:03:10 +00:00
public Fix tag 2020-01-05 19:59:14 +01:00
reception
resource
salaries Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-04 14:20:25 +01:00
societe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-10 14:30:42 +01:00
stripe Fix: the stripe_account is not filled 2019-12-23 22:41:34 +01:00
supplier_proposal Fix opacity on text with a href links inside 2019-12-22 13:19:14 +01:00
support
takepos Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00
theme Trans 2020-01-09 17:16:30 +01:00
ticket
user Look and feel v11 2020-01-07 14:55:31 +01:00
variants Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-10 14:25:26 +01:00
webservices
website Fix website when ckeditor is off 2020-01-09 17:28:08 +01:00
zapier
.gitignore
cache.manifest
document.php
favicon.ico
filefunc.inc.php Prepare 10.0.6 2020-01-05 20:39:45 +01:00
index.php
main.inc.php Fix website when ckeditor is off 2020-01-09 17:28:08 +01:00
master.inc.php
opcachepreload.php
robots.txt
viewimage.php