lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6d84036f66
dolibarr/htdocs
History
Laurent Destailleur 6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
..
accountancy Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-01 19:23:06 +01:00
adherents Empty lines 2018-11-26 12:41:10 +01:00
admin Fix trans 2018-11-29 00:41:12 +01:00
api Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
asset Fix filter on extrafields 2018-11-07 12:49:17 +01:00
asterisk
barcode
blockedlog Fix position of field must be ssame between create/edit/view 2018-11-27 09:22:59 +01:00
bookmarks
cashdesk
categories Fix phpcs 2018-11-19 16:35:37 +01:00
collab
comm Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-01 19:23:06 +01:00
commande Fix auto jump on record if only 1 record in a search 2018-11-27 11:09:47 +01:00
compta Merge pull request #10082 from grandoc/new_branch_26_11_2018 2018-11-29 10:57:48 +01:00
conf fixed sql query error 2018-11-12 16:22:42 +01:00
contact Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-01 19:23:06 +01:00
contrat Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
core Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-01 19:23:06 +01:00
cron FIX Loading translation of cron tasks 2018-11-26 13:31:05 +01:00
custom
datapolicy Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
dav
don Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-28 16:57:39 +01:00
ecm
emailcollector fix : typo error 2018-11-27 10:06:38 +01:00
expedition typo 2018-11-17 18:03:59 +01:00
expensereport Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-01 19:23:06 +01:00
exports Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
externalsite
fichinter fix: Accss to global $conf needed 2018-11-27 18:22:12 +01:00
fourn Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-01 19:23:06 +01:00
ftp
holiday Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
hrm Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
imports
includes Merge branch 'develop' into swiftmailer 2018-11-19 18:23:55 +01:00
install Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-01 19:23:06 +01:00
langs TakeBOX now is 'TakePOS Connector' 2018-12-01 17:09:21 +01:00
livraison Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
loan Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
mailmanspip
margin Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-08 20:19:28 +01:00
modulebuilder FIX Several fixes in fetchAll 2018-11-27 16:39:08 +01:00
multicurrency/class
opensurvey
paybox
paypal
printing
product Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-01 19:23:06 +01:00
projet fix typo error 2018-11-26 14:35:29 +01:00
public Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-01 19:23:06 +01:00
resource Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-26 23:08:06 +01:00
societe Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-01 19:23:06 +01:00
stripe fix typo error 2018-11-26 14:35:29 +01:00
supplier_proposal Fix auto jump on record if only 1 record in a search 2018-11-27 11:09:47 +01:00
support
takepos TakeBOX now is 'TakePOS Connector' 2018-12-01 17:09:21 +01:00
theme Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:03:16 +01:00
ticket Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-01 19:23:06 +01:00
user Merge pull request #10082 from grandoc/new_branch_26_11_2018 2018-11-29 10:57:48 +01:00
variants FIX : Typo errors 2018-11-26 16:09:05 +01:00
webservices
website Fix website import 2018-11-30 15:16:17 +01:00
.gitignore Ignore 2018-11-18 15:57:20 +01:00
cache.manifest
document.php
favicon.ico
filefunc.inc.php Prepare 8.0.4 2018-11-05 13:50:12 +01:00
index.php Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
main.inc.php Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
master.inc.php
robots.txt
viewimage.php