dolibarr/htdocs
Laurent Destailleur 90afbcb034 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/bank.php
	htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
..
accountancy Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-22 10:11:32 +02:00
adherents Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-11 19:56:17 +02:00
admin Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-23 17:02:53 +02:00
api Several fixes (permission, missing method or class) in REST APIs 2017-07-28 11:03:30 +02:00
asterisk
barcode
blockedlog
bookmarks Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
cashdesk
categories Fix regression 2017-07-26 13:46:27 +02:00
collab
comm Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-23 17:02:53 +02:00
commande Prepare code to clone site an fetch external page 2017-08-03 01:45:31 +02:00
compta Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-23 17:02:53 +02:00
conf
contact Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-02 17:56:09 +02:00
contrat Fix missing $form 2017-08-22 10:02:45 +02:00
core Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-23 17:02:53 +02:00
cron Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-21 13:29:08 +02:00
custom
don Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-23 16:11:51 +02:00
ecm Clean ecm code 2017-08-20 23:16:20 +02:00
expedition Bad ojbject for extrafields 2017-08-22 10:37:21 +02:00
expensereport Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-22 10:11:32 +02:00
exports Can export Websites pages. 2017-07-28 14:54:13 +02:00
externalsite
fichinter Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-22 10:11:32 +02:00
fourn Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-23 17:02:53 +02:00
ftp
holiday Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
hrm Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
imports
includes NEW Introduce code syntax coloration with mode 'ace' for DolEditor. 2017-07-18 03:18:16 +02:00
install Fix index declaration must be moved into the .key.sql files. 2017-08-23 15:18:54 +02:00
langs NEW Introduce experimental feature to search dolistore from application 2017-08-22 14:47:01 +02:00
livraison
loan Fix missing $form 2017-08-22 10:02:45 +02:00
mailmanspip
margin Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
modulebuilder Can clone a website 2017-08-21 00:40:45 +02:00
multicurrency/class
opensurvey Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
paybox
paypal
printing
product Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-23 17:02:53 +02:00
projet Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-23 17:02:53 +02:00
public Clean code 2017-08-21 04:17:28 +02:00
resource Update card.php 2017-08-10 13:47:44 +02:00
societe Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-23 17:02:53 +02:00
stripe
supplier_proposal Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-23 16:11:51 +02:00
support Fix link http 2017-08-21 20:49:12 +02:00
theme Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-23 17:02:53 +02:00
user Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-02 17:56:09 +02:00
variants Fix travis error 2017-08-01 01:28:07 +02:00
webservices FIX #7265 2017-08-23 12:47:59 +02:00
websites Fix output keywords 2017-08-22 15:58:57 +02:00
.gitignore
cache.manifest
document.php
favicon.ico
filefunc.inc.php Prepare rc 2017-08-04 18:41:05 +02:00
index.php Fix bad table alignement 2017-08-20 16:21:07 +02:00
main.inc.php Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-23 17:02:53 +02:00
master.inc.php Fix: remove unused $_COOKIE['DOLENTITY'] 2017-07-23 11:42:18 +02:00
robots.txt
viewimage.php