Florian HENRY ab50437331 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/html.form.class.php

2015-01-19 09:38:00 +01:00

..

accountancy

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

2015-01-17 19:26:19 +01:00

adherents

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

2015-01-18 18:44:22 +01:00

admin

Store per entity SMTP configuration

2015-01-18 03:20:35 +01:00

asterisk

Update cidlookup.php

2014-12-30 18:11:55 +01:00

barcode

…

bookmarks

…

cashdesk

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

2015-01-09 23:09:10 +01:00

categories

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

2015-01-16 10:44:41 +01:00

comm

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

2015-01-19 09:38:00 +01:00

commande

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

2015-01-18 18:44:22 +01:00

compta

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

2015-01-19 09:38:00 +01:00

conf

Better doc to install external modules.

2015-01-09 13:00:10 +01:00

contact

Add some "classfortooltip"

2015-01-09 00:07:54 +01:00

contrat

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

2015-01-18 18:44:22 +01:00

core

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

2015-01-19 09:38:00 +01:00

cron

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

2015-01-18 18:44:22 +01:00

custom

Ignore content of directory custom

2015-01-18 13:07:39 +01:00

ecm

Add some "classfortooltip"

2015-01-09 00:07:54 +01:00

expedition

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

2015-01-18 18:44:22 +01:00

exports

…

externalsite

…

fichinter

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

2015-01-18 18:44:22 +01:00

fourn

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

2015-01-18 18:44:22 +01:00

ftp

…

holiday

Add some "classfortooltip"

2015-01-09 00:07:54 +01:00

imports

Fixed: [ bug #1756 ] PHP error while removing an import profile

2014-12-25 12:09:00 +01:00

includes

Update lib with github.com/mfly/php-ipp

2014-12-28 11:29:53 +01:00

install

Fix missing table in migration script

2015-01-19 02:38:24 +01:00

langs

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

2015-01-19 09:38:00 +01:00

livraison

Add some "classfortooltip"

2015-01-09 00:07:54 +01:00

mailmanspip

…

margin

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-01-18 17:13:42 +01:00

opensurvey

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

2015-01-09 23:09:10 +01:00

paybox

…

paypal

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

2014-12-26 04:57:55 +01:00

printing

WIP Printing

2014-12-13 13:53:48 +01:00

product

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

2015-01-18 18:44:22 +01:00

projet

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

2015-01-19 09:38:00 +01:00

public

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

2015-01-16 10:44:41 +01:00

resource

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

2015-01-18 18:44:22 +01:00

societe

Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into

2015-01-17 15:11:12 +01:00

support

…

theme

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

2015-01-16 10:44:41 +01:00

user

Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into

2015-01-17 15:11:12 +01:00

webservices

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

2015-01-10 01:07:55 +01:00

.gitignore

Better doc to install external modules.

2015-01-09 13:00:10 +01:00

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Start 3.6.3

2015-01-09 22:32:25 +01:00

index.php

Typo

2014-12-09 23:23:10 +01:00

main.inc.php

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

2015-01-18 18:44:22 +01:00

master.inc.php

…

robots.txt

…

viewimage.php

…