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

Conflicts:
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
..
accountancy Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-15 21:25:14 +02:00
adherents Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-07-18 15:23:43 +02:00
admin Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-07-21 20:42:21 +02:00
api Fix: module "root" not exists ! (deprecated api) 2017-07-05 12:21:35 +02:00
asterisk
barcode Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-09 12:50:56 +02:00
blockedlog Standardize and debug code of module BlockedLog 2017-06-16 12:46:15 +02:00
bookmarks Fix remove warnings 2017-07-09 20:31:27 +02:00
cashdesk Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-06-14 12:16:10 +02:00
categories FIX #7146 2017-07-13 15:16:17 +02:00
collab Debug module website 2017-07-03 12:04:45 +02:00
comm Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-07-21 20:42:21 +02:00
commande Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-07-21 20:42:21 +02:00
compta Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-07-21 20:42:21 +02:00
conf
contact Fix var init 2017-07-13 23:52:02 +02:00
contrat Merge branch 'develop' into patch-rib 2017-07-21 14:58:33 +02:00
core Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-07-21 20:42:21 +02:00
cron Fix remove warnings 2017-07-13 00:35:10 +02:00
custom
don Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-07-16 07:51:20 +02:00
ecm fix class error 2017-07-05 11:24:24 +02:00
expedition Fix remove warnings 2017-07-13 00:35:10 +02:00
expensereport Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-07-16 07:51:20 +02:00
exports Fix better management of export of extrafield computed. 2017-06-13 18:50:31 +02:00
externalsite Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-18 21:13:48 +02:00
fichinter Merge branch 'develop' into patch-rib 2017-07-21 14:58:33 +02:00
fourn Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-07-21 20:42:21 +02:00
ftp
holiday Fix remove warnings 2017-07-13 00:35:10 +02:00
hrm Fix position of top menu does not follow 'position' field. 2017-06-27 04:25:41 +02:00
imports
includes NEW Introduce code syntax coloration with mode 'ace' for DolEditor. 2017-07-18 03:18:16 +02:00
install Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-07-21 20:42:21 +02:00
langs The css files is also parsed with function to clean images 2017-07-21 20:16:53 +02:00
livraison Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
loan Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-07-16 07:51:20 +02:00
mailmanspip
margin Fix remove warnings 2017-07-13 00:35:10 +02:00
modulebuilder Work on module website 2017-07-19 16:38:00 +02:00
multicurrency/class
opensurvey Look and feel v6 2017-07-04 13:05:02 +02:00
paybox
paypal
printing
product Merge pull request #7078 from atm-florian/dev_prodlist 2017-07-21 15:15:11 +02:00
projet Merge branch 'develop' into patch-21 2017-07-21 15:18:18 +02:00
public Debug module website 2017-07-21 02:30:02 +02:00
resource Fix remove warnings 2017-07-13 00:35:10 +02:00
societe Merge branch 'develop' into patch-rib 2017-07-21 14:58:33 +02:00
stripe
supplier_proposal Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-07-16 07:51:20 +02:00
support Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-14 10:48:34 +02:00
theme Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-20 18:31:58 +02:00
user Debug journalization 2017-07-15 12:37:31 +02:00
variants Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-18 21:13:48 +02:00
webservices
websites The css files is also parsed with function to clean images 2017-07-21 20:16:53 +02:00
.gitignore
cache.manifest
document.php Help/Need debug of some online instances with the log view 2017-06-20 16:54:37 +02:00
favicon.ico
filefunc.inc.php Prepare 7.0 alpha 2017-07-14 14:41:25 +02:00
index.php Fix count show 0 if empty 2017-07-12 20:32:49 +02:00
main.inc.php Fix remove warnings 2017-07-09 20:31:27 +02:00
master.inc.php Fix too much code into the NOREQUIREDB 2017-07-02 13:18:23 +02:00
robots.txt
viewimage.php