dolibarr/htdocs
Laurent Destailleur e25651204c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/admin.lib.php
2013-06-05 18:56:41 +02:00
..
accountancy Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
adherents Fix: EOF 2013-06-05 16:24:32 +02:00
admin Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2013-06-05 18:56:41 +02:00
asterisk Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
bookmarks Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
boutique Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
cashdesk Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
categories Fix: EOF 2013-06-05 16:24:32 +02:00
comm Fix: EOF 2013-06-05 16:24:32 +02:00
commande Fix: EOF 2013-06-05 16:24:32 +02:00
compta Fix: EOF 2013-06-05 16:24:32 +02:00
conf Fix: Doc not uptodate 2013-01-09 11:44:45 +01:00
contact Fix: EOF 2013-06-05 16:24:32 +02:00
contrat Update contrat.class.php 2013-05-28 10:05:49 +02:00
core Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2013-06-05 18:56:41 +02:00
cron Fix: EOF 2013-06-05 16:24:32 +02:00
ecm Fix: Error management 2013-04-22 00:57:56 +02:00
expedition Merge remote-tracking branch 'origin/3.3' into develop 2013-04-28 01:24:58 +02:00
exports Fix: EOF 2013-06-05 16:24:32 +02:00
externalsite Merge remote-tracking branch 'origin/3.3' into develop 2013-04-22 01:39:49 +02:00
fichinter Fix: EOF 2013-06-05 16:24:32 +02:00
fourn Fix: EOF 2013-06-05 16:24:32 +02:00
ftp Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
holiday Merge remote-tracking branch 'origin/3.4' into develop 2013-05-14 01:15:05 +02:00
imports Fix: EOF 2013-06-05 16:24:32 +02:00
includes Fixed bug in jsgantt.js showing 'NaN' when start/end date were missing 2013-05-10 07:10:05 +02:00
install Fix: EOF 2013-06-05 16:24:32 +02:00
langs Merge remote-tracking branch 'origin/3.4' into develop 2013-06-04 22:59:28 +02:00
livraison [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
mailmanspip/class Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2013-06-05 18:56:41 +02:00
margin Missing succes message in margin module config page 2013-05-19 12:19:31 +02:00
opensurvey Fix: EOF 2013-06-05 16:24:32 +02:00
paybox Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
paypal Merge remote-tracking branch 'origin/3.3' into develop 2013-04-14 01:46:33 +02:00
printipp Fix: doxygen 2013-03-10 13:24:08 +01:00
product Fix: EOF 2013-06-05 16:24:32 +02:00
projet Fix: EOF 2013-06-05 16:24:32 +02:00
public Fix: EOF 2013-06-05 16:24:32 +02:00
societe Fix: EOF 2013-06-05 16:24:32 +02:00
support Fix: EOF 2013-06-05 16:24:32 +02:00
theme Fix: EOF 2013-06-05 16:24:32 +02:00
user Normalized line endings to LF 2013-06-05 16:12:07 +02:00
webservices Normalized line endings to LF 2013-06-05 16:12:07 +02:00
.gitignore Protection to avoid not desired modules into packages 2013-01-19 18:47:35 +01:00
cache.manifest Fix: Removed useless file (not correctly defined) to avoid cache 2013-05-26 03:57:34 +02:00
disabled.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
document.php fix: LF 2013-06-04 22:03:11 +02:00
favicon.ico
filefunc.inc.php Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:00:16 +02:00
index.php Fix typo in contracts language file name 2013-05-26 19:36:24 +03:00
main.inc.php Fix: EOF 2013-06-05 16:24:32 +02:00
master.inc.php Fix: broken features with multicompany 2013-04-25 15:49:27 +02:00
robots.txt
viewimage.php Normalized line endings to LF 2013-06-05 16:12:07 +02:00