dolibarr/htdocs
Marcos García de La Fuente c07e26dcac Merge branch 'develop' into fr-2613
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:42:57 +02:00
..
accountancy FIXME that are not bug are replaced with TODO 2015-04-12 04:01:28 +02:00
adherents Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
admin Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
asterisk
barcode
bookmarks NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
cashdesk fix syntax errors 2015-04-18 18:07:41 +02:00
categories Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
comm Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
commande Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
compta Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
conf Delete phpinfo.php 2015-04-01 18:57:54 +02:00
contact NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
contrat NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
core Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
cron Merge remote-tracking branch 'origin/3.7' into develop 2015-03-25 18:11:29 +01:00
custom
don Travis Fix don.class.php 2015-04-02 18:48:47 +02:00
ecm
expedition Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
expensereport fix syntax errors 2015-04-18 18:07:41 +02:00
exports Merge remote-tracking branch 'origin/3.7' into develop 2015-04-13 13:08:46 +02:00
externalsite
fichinter Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
fourn Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
ftp
holiday
imports
includes Update PEAR Mail_MIME to 1.8.9 2015-04-18 04:27:15 +02:00
install Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
langs Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
livraison Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
loan Update loan card 2015-04-10 18:26:28 +02:00
mailmanspip
margin Uniformize code 2015-04-07 03:00:11 +02:00
opensurvey fix syntax errors 2015-04-18 18:07:41 +02:00
paybox
paypal Fix: PHPCS 2015-04-08 00:14:44 +02:00
printing Clean code 2015-04-06 11:59:58 +02:00
product Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
projet Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
public Fix warnings when submitting a vote for a survey 2015-04-12 11:42:49 +02:00
resource Fix: error when deleting resource 2015-04-18 18:07:59 +02:00
societe Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
support
theme Adjust CSS : missing color for input, textarea and select list 2015-04-18 19:01:33 +02:00
user NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
webservices Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
.gitignore
cache.manifest
disabled.php
document.php
favicon.ico
filefunc.inc.php NEW : dev feature : replace conf filename with "conf" parameter on url by GET 2015-04-18 15:26:33 +01:00
index.php Comment 2015-03-31 17:23:07 +02:00
main.inc.php Fix code standard 2015-04-06 12:22:52 +02:00
master.inc.php
robots.txt
viewimage.php