dolibarr/htdocs
Laurent Destailleur ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
..
accountancy Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
adherents FIX #5803 2016-09-28 17:53:49 +02:00
admin Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
api Merge branch 'rest-api-add-accounts' of 2016-09-26 02:28:16 +02:00
asterisk
barcode Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
bookmarks Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:07:55 +02:00
cashdesk Fix minor css 2016-09-09 09:21:27 +02:00
categories Uniformize code. 2016-09-26 02:13:58 +02:00
comm Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
commande Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
compta Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
conf Merge branch 'remove-mysql-driver' of 2016-08-05 13:12:43 +02:00
contact Uniformize code 2016-09-18 16:11:30 +02:00
contrat Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
core Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
cron Better center of left, center and right part of titles. 2016-09-20 12:51:09 +02:00
custom
don Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
ecm Correct presentation 2016-09-24 14:47:51 +02:00
expedition Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-29 10:49:47 +02:00
expensereport Uniformize code. 2016-09-26 02:13:58 +02:00
exports Fix when going back on an export page after session has expired to avoid 2016-07-15 14:14:55 +02:00
externalsite
fichinter Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2016-09-26 01:32:50 +02:00
fourn Uniformize code 2016-09-28 21:08:25 +02:00
ftp
holiday Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-09 09:32:14 +02:00
hrm Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-01 11:37:40 +02:00
imports
includes Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-12 02:05:38 +02:00
install Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
langs Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
livraison Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
loan
mailmanspip
margin Uniformize code 2016-09-28 21:08:25 +02:00
multicurrency/class
opensurvey Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-19 14:05:16 +02:00
paybox
paypal Uniformize code 2016-09-21 01:25:34 +02:00
printing FIX #5512 2016-07-27 19:36:17 +02:00
product Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
projet Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
public Move tab menu for subscription in member.lib 2016-09-24 06:48:40 +02:00
resource Uniformize look using dol_banner 2016-09-19 10:43:30 +02:00
societe Merge pull request #5795 from atm-ph/fix_4.0_value_too_long 2016-09-28 17:58:57 +02:00
supplier_proposal Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
support
theme CSS enhancement 2016-10-01 12:51:35 +02:00
user Merge branch 'new_no_default_rights' of 2016-09-30 13:04:14 +02:00
webservices FIX SEC Improve CSRF protection. Reduce usage of NOCSRFCHECK. 2016-09-08 12:12:00 +02:00
websites Work on module website 2016-09-17 21:03:20 +02:00
.gitignore
cache.manifest
disabled.php
document.php
favicon.ico
filefunc.inc.php FIX SEC Improve CSRF protection. Reduce usage of NOCSRFCHECK. 2016-09-08 12:12:00 +02:00
index.php Fix tooltip on late button 2016-09-08 18:14:31 +02:00
main.inc.php Removed a old hidden problematic feature never used in Dolibarr. If an 2016-09-22 11:31:15 +02:00
master.inc.php
robots.txt
viewimage.php