Laurent Destailleur ad0f842b60 Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into ...

atm-maxime-mkoevols

Conflicts:
	htdocs/commande/card.php

2014-10-18 15:38:49 +02:00

..

accountancy

Merge pull request #1944 from aspangaro/develop-accounting

2014-10-12 01:38:40 +02:00

adherents

Miscellaneous fixes

2014-10-16 20:55:13 +02:00

admin

Better error management and better error message for reporting upload or

2014-10-18 14:56:06 +02:00

asterisk

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

barcode

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

bookmarks

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

cashdesk

Brighter button. We use CSS and no more image.

2014-10-03 11:27:12 +02:00

categories

Miscellaneous fixes

2014-10-16 20:55:13 +02:00

comm

Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into

2014-10-18 15:38:49 +02:00

commande

Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into

2014-10-18 15:38:49 +02:00

compta

Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into

2014-10-18 15:38:49 +02:00

conf

Clean path dolibarr_main_url_root to avoid duplicate /.

2014-08-06 00:06:27 +02:00

contact

Fix permissions

2014-10-17 15:01:56 +02:00

contrat

Qual : refactoring extrafields display on objects into a single tpl file

2014-10-14 17:00:06 +02:00

core

Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into

2014-10-18 15:38:49 +02:00

cron

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

2014-10-12 02:54:34 +02:00

ecm

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

expedition

Fix increase stock on shipment validation

2014-10-06 14:10:27 +02:00

exports

Fix: Missing field tobuy into service export.

2014-08-29 20:26:27 +02:00

externalsite

Deprecating arbitrary use of dol_htmloutput* functions

2014-07-20 02:32:13 +02:00

fichinter

Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into

2014-10-18 15:38:49 +02:00

fourn

Qual : refactoring extrafields display on objects into a single tpl file

2014-10-14 17:00:06 +02:00

ftp

Revert "Scrutinizer Auto-Fixes"

2014-07-21 19:07:56 +02:00

holiday

Fix: Fix permission on files.

2014-10-17 15:30:38 +02:00

imports

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

2014-09-28 02:14:32 +02:00

includes

Fix: Missing source

2014-09-14 21:52:52 +02:00

install

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

2014-10-15 15:02:36 +02:00

langs

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

2014-10-18 14:57:49 +02:00

livraison

New: add context "globalcard" for declaring only once all cards

2014-10-06 07:20:58 +02:00

mailmanspip

Revert "Scrutinizer Auto-Fixes"

2014-07-21 19:07:56 +02:00

margin

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

opensurvey

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

paybox

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

paypal

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

printipp

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

2014-09-28 02:14:32 +02:00

product

Better error management and better error message for reporting upload or

2014-10-18 14:56:06 +02:00

projet

Fix permissions

2014-10-17 15:01:56 +02:00

public

Removed unmaintaned OScommerce module

2014-09-29 15:22:48 +02:00

resource

Fix: Fix permission on files.

2014-10-17 15:30:38 +02:00

societe

Fix: Solve some regressions

2014-10-18 01:32:38 +02:00

support

Uniformize, support, install and login page with a more neutral

2014-10-03 01:48:14 +02:00

theme

Better error management and better error message for reporting upload or

2014-10-18 14:56:06 +02:00

user

Fix: Selection of users color was not user owner of event.

2014-10-18 15:35:32 +02:00

webservices

Added date start/end at webservice createOrder

2014-10-16 18:09:16 +02:00

.gitignore

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

2014-09-18 10:17:43 +02:00

cache.manifest

Look: Refresh install style with more neutral colors. Select line style

2014-08-03 11:18:32 +02:00

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 3.6.1

2014-09-27 12:34:45 +02:00

index.php

Qual: Renamed all files & links "liste.php" into "list.php"

2014-09-18 20:33:37 +02:00

main.inc.php

Minor look enhancement

2014-10-03 12:54:29 +02:00

master.inc.php

trigger on total

2014-08-12 11:40:24 +02:00

robots.txt

…

viewimage.php

…