lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
728e36f70f
dolibarr/htdocs
History
Laurent Destailleur 728e36f70f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/index.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/api_invoices.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/actions_sendmails.inc.php
2017-10-22 01:43:33 +02:00
..
accountancy Merge branch 'develop' into scrutinizer-patch-3 2017-10-16 20:54:15 +02:00
adherents Better responsive 2017-10-19 19:53:29 +02:00
admin More modern picto for switch on/off 2017-10-20 21:39:19 +02:00
api Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
asterisk
barcode
blockedlog Fix scrutinizer 2017-10-16 08:52:00 +02:00
bookmarks FIX Error when adding a bookmark after using an external GET bookmark 2017-10-21 14:52:58 +02:00
cashdesk Move function colorIsLight into functions.lib.php 2017-10-16 09:29:10 +02:00
categories Move function colorIsLight into functions.lib.php 2017-10-16 09:29:10 +02:00
collab Clean code 2017-10-20 23:49:20 +02:00
comm Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
commande Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
compta Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
conf
contact Scrutinizer Auto-Fixes 2017-10-13 11:28:26 +00:00
contrat Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
core Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
cron
custom
don Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-18 19:51:29 +02:00
ecm Introduce main_doc into table of objects to know what is main doc. 2017-10-19 11:40:40 +02:00
expedition Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
expensereport Move default value for user expense report on tab expense report 2017-10-20 17:02:26 +02:00
exports NEW Can export list of stock movements 2017-10-20 14:52:01 +02:00
externalsite
fichinter Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-18 19:51:29 +02:00
fourn Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
ftp
holiday Clean code 2017-10-20 23:49:20 +02:00
hrm
imports
includes NEW Remove js library fileupload that was not used by core code. 2017-10-21 19:40:17 +02:00
install Clean code 2017-10-20 23:49:20 +02:00
langs Work on website 2017-10-21 12:26:14 +02:00
livraison Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-18 19:51:29 +02:00
loan
mailmanspip
margin
modulebuilder Clean code 2017-10-20 23:49:20 +02:00
multicurrency/class
opensurvey
paybox
paypal
printing
product Clean code 2017-10-20 23:49:20 +02:00
projet Better translation 2017-10-20 04:25:49 +02:00
public Clean code 2017-10-20 23:49:20 +02:00
resource Clean code 2017-10-20 23:49:20 +02:00
societe Work on website 2017-10-21 12:26:14 +02:00
stripe
supplier_proposal Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
support
theme Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
user NEW Remove js library fileupload that was not used by core code. 2017-10-21 19:40:17 +02:00
variants
webservices Add API "close" for proposals 2017-10-18 11:10:08 +02:00
website Clean code 2017-10-20 23:49:20 +02:00
.gitignore
cache.manifest
document.php Change signature of file to match other urls to link/download files. 2017-10-05 10:25:06 +02:00
favicon.ico
filefunc.inc.php Prepare 6.0.3 2017-10-08 19:46:24 +02:00
index.php Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
main.inc.php NEW Upgrade jquery select2 to 4.0.4 2017-10-21 19:05:24 +02:00
master.inc.php
robots.txt
viewimage.php