dolibarr/htdocs
Laurent Destailleur 3844d4e6f7 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	ChangeLog
	htdocs/core/boxes/box_activity.php
	htdocs/fourn/commande/card.php
	htdocs/user/card.php
2015-03-23 15:16:37 +01:00
..
accountancy Update purchasesjournal.php 2015-03-11 10:23:33 +01:00
adherents Clean code 2015-03-17 10:52:27 +01:00
admin Fix: a line was inserted when making update 2015-03-23 14:43:19 +01:00
asterisk Merge remote-tracking branch 'origin/3.7' into develop 2015-02-19 00:01:26 +01:00
barcode Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into 2015-02-18 22:54:02 +01:00
bookmarks QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
cashdesk Merge remote-tracking branch 'origin/3.7' into develop 2015-02-19 00:01:26 +01:00
categories QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
comm Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
commande Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
compta Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
conf Merge remote-tracking branch 'origin/3.7' into develop 2015-03-23 15:16:37 +01:00
contact QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
contrat Doxygen 2015-03-17 11:23:45 +01:00
core Merge remote-tracking branch 'origin/3.7' into develop 2015-03-23 15:16:37 +01:00
cron Merge remote-tracking branch 'origin/3.7' into develop 2015-02-26 13:36:07 +01:00
custom Ignore content of directory custom 2015-01-18 13:07:39 +01:00
ecm QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
expedition NEW: Enhancement of module 'Notification by Email'. Show nb of 2015-03-18 21:44:57 +01:00
expensereport Doxygen 2015-03-17 11:23:45 +01:00
exports Merge pull request #2449 from defrance69/patch-51 2015-03-22 14:07:05 +01:00
externalsite Fix: syntax error 2014-12-04 01:23:39 +01:00
fichinter Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
fourn Merge remote-tracking branch 'origin/3.7' into develop 2015-03-23 15:16:37 +01:00
ftp Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
holiday QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
imports Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
includes Fixed line endings 2015-03-15 18:01:21 +01:00
install Merge remote-tracking branch 'origin/3.7' into develop 2015-03-23 15:16:37 +01:00
langs Merge branch 'price-global-variables' of 2015-03-22 12:45:04 +01:00
livraison QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
mailmanspip Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
margin Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
opensurvey Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
paybox Replace <center> tags 2014-11-25 20:13:43 +01:00
paypal Merge remote-tracking branch 'origin/3.7' into develop 2014-12-26 04:57:55 +01:00
printing Fix doxygen 2015-02-11 15:05:52 +01:00
product Merge remote-tracking branch 'origin/3.7' into develop 2015-03-23 15:16:37 +01:00
projet NEW: Title of page project contains project ref and label 2015-03-23 12:44:41 +01:00
public Update test page to prepare datatables architecture. 2015-03-22 21:26:13 +01:00
resource QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
societe Fix css 2015-03-22 18:39:05 +01:00
support Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
theme Enhance themes 2015-03-23 14:53:21 +01:00
user Merge remote-tracking branch 'origin/3.7' into develop 2015-03-23 15:16:37 +01:00
webservices Closed #2414 2015-03-04 20:34:41 +01:00
.gitignore Better doc to install external modules. 2015-01-09 13:00:10 +01:00
cache.manifest Fixed: bad url 2015-01-22 23:49:32 +01:00
disabled.php
document.php Fix: Pb of file upload and download. 2014-02-08 02:02:01 +01:00
favicon.ico
filefunc.inc.php Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
index.php Fix Not into official 3.7 but must be into migration for 3.7 when 2015-03-20 15:19:42 +01:00
main.inc.php Method colorStringToArray can accept the # 2015-03-22 18:17:25 +01:00
master.inc.php trigger on total 2014-08-12 11:40:24 +02:00
robots.txt
viewimage.php