dolibarr/htdocs
Laurent Destailleur 6e078105ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2019-01-06 01:22:10 +01:00
..
accountancy Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-06 01:22:10 +01:00
adherents Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-27 21:31:52 +01:00
admin Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-06 01:22:10 +01:00
api Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
asset add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
asterisk Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
barcode
blockedlog Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-04 19:36:20 +01:00
bookmarks
cashdesk Debug cash fence 2018-12-19 15:40:01 +01:00
categories Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
collab
comm Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
commande Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
compta Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-04 19:36:20 +01:00
conf fixed sql query error 2018-11-12 16:22:42 +01:00
contact FIX: delete all contact categories 2019-01-03 13:00:06 +01:00
contrat Merge branch 'develop' into NEW_change_order_concat_desc 2018-12-14 17:44:08 +01:00
core Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-06 01:22:10 +01:00
cron Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
custom
datapolicy Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-09 18:13:59 +01:00
dav
don Fix phpcs 2019-01-02 20:00:08 +01:00
ecm Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
emailcollector Fix user/pass not mandatory 2019-01-03 12:57:03 +01:00
expedition FIX Extrafields on shipment module 2018-12-16 18:44:58 +01:00
expensereport Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 18:50:06 +01:00
exports Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-16 13:39:56 +01:00
externalsite Fix use iframe to embed content 2018-12-10 19:06:34 +01:00
fichinter Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
fourn Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
ftp
holiday FIX replace deprecated "print_fiche_titre" with "load_fiche_titre" 2018-12-25 08:34:26 +01:00
hrm Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +01:00
imports import.php 2018-12-20 16:49:17 +01:00
includes Fix perms 2019-01-05 15:22:24 +01:00
install Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-04 19:36:20 +01:00
langs Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-04 19:36:20 +01:00
livraison
loan Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
mailmanspip
margin FIX replace deprecated "print_fiche_titre" with "load_fiche_titre" 2018-12-25 08:34:26 +01:00
modulebuilder Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-06 01:22:10 +01:00
multicurrency/class
opensurvey Fix opensurvey 2018-12-11 10:52:59 +01:00
paybox
paypal
printing
product Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
projet WIP Work on split of timespent 2019-01-04 16:24:56 +01:00
public Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-26 19:43:01 +01:00
reception Fix phpcs 2018-12-17 03:14:31 +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 '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
stripe Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
supplier_proposal Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
support
takepos Merge pull request #10284 from ptibogxiv/patch-101 2019-01-02 20:01:16 +01:00
theme Add option to use fontawesome 5 with fontawesome 4 2019-01-03 21:14:59 +01:00
ticket FIX replace deprecated "print_titre" with "load_fiche_titre" 2018-12-25 08:36:42 +01:00
user Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
variants FIX replace deprecated "print_fiche_titre" with "load_fiche_titre" 2018-12-25 08:34:26 +01:00
webservices Fix multicompany 2018-12-14 16:20:23 +01:00
website Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-04 19:36:20 +01:00
.gitignore Ignore 2018-11-18 15:57:20 +01:00
cache.manifest FIX remove deprecated and unused file 2018-10-27 14:26:23 +02:00
document.php Fix param attachment 2018-12-17 18:48:41 +01:00
favicon.ico
filefunc.inc.php Prepare 10.0 2018-12-04 16:09:49 +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 '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-06 01:22:10 +01:00
master.inc.php
robots.txt Add example of comment 2012-11-07 02:22:25 +01:00
viewimage.php FIX Download of files with hashp when files are into user dir 2018-12-17 15:35:20 +01:00