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

develop

Conflicts:
	ChangeLog

2014-06-26 21:41:45 +02:00

..

accountancy

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

adherents

Fix: doxygen

2014-06-20 13:07:15 +02:00

admin

Fix: Deprecated and no more used fields should not appear to user.

2014-06-21 18:08:32 +02:00

asterisk

…

barcode

…

bookmarks

…

boutique

Shop - Bad language file ("boutique" instead of "shop") & add language key

2014-06-17 06:31:20 +02:00

cashdesk

Fix: security

2014-05-28 19:38:30 +02:00

categories

Divers

2014-06-16 06:17:46 +02:00

comm

Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop

2014-06-26 21:38:03 +02:00

commande

Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop

2014-06-26 21:38:03 +02:00

compta

Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop

2014-06-26 21:38:03 +02:00

conf

…

contact

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

contrat

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

core

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

2014-06-26 21:41:45 +02:00

cron

…

ecm

…

expedition

Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop

2014-06-26 21:38:03 +02:00

exports

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

2014-05-18 11:52:52 +02:00

externalsite

…

fichinter

Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop

2014-06-26 21:38:03 +02:00

fourn

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

2014-06-26 21:41:45 +02:00

ftp

…

holiday

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

2014-05-29 19:20:48 +02:00

imports

Fix: [ bug #1384 ] Wrong name for import products and product prices

2014-05-11 17:52:16 +02:00

includes

License violation: Missing source on min file.

2014-05-27 00:26:53 +02:00

install

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

2014-06-17 12:01:45 +02:00

langs

New: Filter on event status

2014-06-26 20:24:00 +02:00

livraison

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

mailmanspip/class

…

margin

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

2014-05-18 11:52:52 +02:00

opensurvey

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

paybox

…

paypal

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

printipp

…

product

Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop

2014-06-26 21:38:03 +02:00

projet

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

2014-06-25 20:22:25 +02:00

public

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

2014-06-09 15:30:41 +02:00

resource

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

societe

Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop

2014-06-26 21:38:03 +02:00

support

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

theme

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

2014-05-29 19:20:48 +02:00

user

Fix: doxygen

2014-06-20 13:07:15 +02:00

webservices

Merge pull request #1613 from guerinaxel/patch-4

2014-06-26 21:25:01 +02:00

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into

2014-06-10 01:37:43 +02:00

index.php

…

main.inc.php

Merge pull request #1679 from defrance69/patch-1

2014-06-23 20:28:53 +02:00

master.inc.php

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

2014-06-09 15:30:41 +02:00

robots.txt

…

viewimage.php

…