Laurent Destailleur 29dfb71bbd Merge branch 'patch-11' of github.com:defrance69/dolibarr into ...

defrance69-patch-11

Conflicts:
	htdocs/core/class/commonobject.class.php

2014-06-26 23:04:26 +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

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

2014-06-26 22:54:36 +02:00

asterisk

Removed closing php tag

2014-05-03 18:18:44 +02:00

barcode

Removed closing php tag

2014-05-03 18:18:44 +02:00

bookmarks

Removed closing php tag

2014-05-03 18:18:44 +02:00

boutique

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

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

cashdesk

Add option to enable keypad (in most cases, we don't need this).

2014-06-26 21:57:49 +02:00

categories

Divers

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

comm

Merge pull request #1641 from defrance69/patch-17

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

commande

Merge pull request #1641 from defrance69/patch-17

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

compta

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

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

conf

Qual: Better error message for LDAP connection

2014-04-27 14:16:29 +02:00

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 'patch-11' of github.com:defrance69/dolibarr into

2014-06-26 23:04:26 +02:00

cron

Removed closing php tag

2014-05-03 18:18:44 +02:00

ecm

Removed closing php tag

2014-05-03 18:18:44 +02:00

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

Removed closing php tag

2014-05-03 18:18:44 +02:00

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

Removed closing php tag

2014-05-03 18:18:44 +02:00

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-accounting3' of github.com:aspangaro/dolibarr into

2014-06-26 22:53:25 +02:00

langs

Merge pull request #1668 from aspangaro/develop-dons

2014-06-26 22:03:13 +02:00

livraison

Qual: remove PHP closing tag (again)

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

mailmanspip/class

Removed closing php tag

2014-05-03 18:18:44 +02:00

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

Removed closing php tag

2014-05-03 18:18:44 +02:00

paypal

Qual: remove PHP closing tag (again)

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

printipp

Removed closing php tag

2014-05-03 18:18:44 +02:00

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

Update ignore file

2013-12-10 22:58:39 +01:00

cache.manifest

…

disabled.php

…

document.php

Fix: Pb of file upload and download.

2014-02-08 02:02:01 +01:00

favicon.ico

…

filefunc.inc.php

Prepare 3.7 development.

2014-06-26 21:48:57 +02:00

index.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

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

Work on barcode number generation.

2014-01-30 18:21:04 +01:00