Laurent Destailleur 0b045a2d96 Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	htdocs/core/boxes/box_activity.php
	htdocs/filefunc.inc.php

2013-01-16 14:11:19 +01:00

..

accountancy

Fix: Solve conflict into migration/backup/restore (child tables

2012-12-08 14:16:39 +01:00

adherents

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-13 19:33:54 +01:00

admin

Qual: A translation file must not be loaded into class constructors, but

2013-01-15 17:06:53 +01:00

asterisk

…

bookmarks

…

boutique

…

cashdesk

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

categories

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-13 19:33:54 +01:00

comm

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-16 14:11:19 +01:00

commande

Fix: wrong EOL !!!!!!!

2013-01-10 08:27:12 +01:00

commissions

Fix: wrong EOL

2012-12-02 11:03:23 +01:00

compta

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-13 19:33:54 +01:00

conf

Fix: Doc not uptodate

2013-01-09 11:44:45 +01:00

contact

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

contrat

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-02 22:15:58 +01:00

core

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-16 14:11:19 +01:00

cron

…

ecm

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

expedition

Fix: [ bug #622 ] attaching wrong file when sending the invoice via

2013-01-07 00:40:18 +01:00

exports

Fix: wrong EOL !!!!!!!

2013-01-10 08:27:12 +01:00

externalsite

…

fichinter

Fix bug #666 : error when sending intervention card

2013-01-09 06:30:27 +01:00

fourn

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-16 14:11:19 +01:00

ftp

Fix: wrong EOL !!!!!!!

2013-01-10 08:27:12 +01:00

holiday

Fix: wrong EOL !!!!!!!

2013-01-10 08:27:12 +01:00

imports

Fix: [ bug #618 ] External accounts can access confidential informations

2013-01-02 18:43:59 +01:00

includes

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-13 19:33:54 +01:00

install

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-15 12:06:41 +01:00

langs

Qual: We can enable box by default because a warning is output to user.

2013-01-15 15:53:35 +01:00

livraison

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

mailmanspip/class

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

margin

Look: Uniformize style

2012-12-08 17:42:08 +01:00

paybox

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

paypal

Translated some strings in the code

2012-12-31 05:55:06 +01:00

product

Fix: broken features

2013-01-15 11:41:12 +01:00

projet

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-13 19:33:54 +01:00

public

Fix: wrong EOL !!!!!!!

2013-01-10 08:27:12 +01:00

societe

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-13 19:33:54 +01:00

support

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

theme

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

2013-01-14 13:08:48 +01:00

user

Fix: Missinf class

2013-01-15 15:43:37 +01:00

webservices

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-16 14:11:19 +01:00

.gitignore

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-08 11:10:47 +01:00

cache.manifest

…

disabled.php

…

document.php

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

favicon.ico

…

filefunc.inc.php

Fix: Removed warning

2013-01-15 15:44:42 +01:00

index.php

Qual: A translation file must not be loaded into class constructors, but

2013-01-15 17:06:53 +01:00

main.inc.php

Qual: Merge the 2 class MenuTop and MenuLeft into menu handler file

2013-01-15 15:42:39 +01:00

master.inc.php

Fix: wrong EOL !!!!!!!

2013-01-10 08:27:12 +01:00

robots.txt

…

viewimage.php

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00