dolibarr/htdocs
Regis Houssin a494e01f00 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
..
accountancy Avoid duplicate function 2017-09-12 19:52:05 +02:00
adherents Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-14 12:07:19 +02:00
admin Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-14 12:07:19 +02:00
api
asterisk
barcode
blockedlog
bookmarks Removed not used field 2017-09-10 18:01:34 +02:00
cashdesk Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-07 10:50:35 +02:00
categories Fix bug reported by scrutinizer 2017-09-12 19:21:26 +02:00
collab
comm Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-14 12:07:19 +02:00
commande Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-14 12:07:19 +02:00
compta Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-14 12:07:19 +02:00
conf
contact Start remove $GLOBALS 2017-09-12 19:49:07 +02:00
contrat The event array of an object is visible even if no event yet recorded. 2017-09-13 14:18:36 +02:00
core Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-14 12:07:19 +02:00
cron Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-08 13:30:54 +02:00
custom Fix doc 2017-09-04 11:22:53 +02:00
don Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-11 08:07:55 +02:00
ecm Debug modulebuilder 2017-08-27 13:28:37 +02:00
expedition The event array of an object is visible even if no event yet recorded. 2017-09-13 14:18:36 +02:00
expensereport Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-11 08:07:55 +02:00
exports
externalsite
fichinter The event array of an object is visible even if no event yet recorded. 2017-09-13 14:18:36 +02:00
fourn Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-14 12:07:19 +02:00
ftp
holiday Fix error reported by scrutinizer 2017-09-04 12:23:44 +02:00
hrm
imports
includes Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-14 11:49:02 +02:00
install Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-14 12:07:19 +02:00
langs Fix phpunit 2017-09-14 09:16:57 +02:00
livraison
loan Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-08-22 18:49:40 +02:00
mailmanspip
margin Fix search criteria list 2017-09-12 14:50:12 +02:00
modulebuilder The event array of an object is visible even if no event yet recorded. 2017-09-13 14:18:36 +02:00
multicurrency/class
opensurvey
paybox Add a message on payment forms 2017-09-09 09:54:42 +02:00
paypal Add a message on payment forms 2017-09-09 09:54:42 +02:00
printing
product Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-13 20:57:53 +02:00
projet Merge pull request #7373 from atm-arnaud/FIX_time_without_projectid 2017-09-14 12:02:16 +02:00
public Fix typo 2017-09-12 19:06:47 +02:00
resource Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
societe Update travis 2017-09-14 09:56:02 +02:00
stripe Add a message on payment forms 2017-09-09 09:54:42 +02:00
supplier_proposal Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-09-14 12:07:19 +02:00
support
theme Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-13 20:57:53 +02:00
user The event array of an object is visible even if no event yet recorded. 2017-09-13 14:18:36 +02:00
variants
webservices FIX #7265 2017-08-23 12:47:59 +02:00
websites Enhancement for smartphone 2017-09-04 09:25:53 +02:00
.gitignore
cache.manifest
document.php FIX Security fixes (filter onload js, less verbose error message in 2017-09-06 11:39:30 +02:00
favicon.ico
filefunc.inc.php Prepare 6.0.1 2017-09-04 12:13:12 +02:00
index.php Enhancement for smartphone 2017-09-04 09:25:53 +02:00
main.inc.php Fix ref must be 50 2017-09-12 11:51:51 +02:00
master.inc.php
robots.txt
viewimage.php FIX Security fixes (filter onload js, less verbose error message in 2017-09-06 11:39:30 +02:00