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

develop

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fourn/card.php

2014-09-29 16:01:49 +02:00

..

accountancy

Merge pull request #1910 from FHenry/develop

2014-09-22 23:48:32 +02:00

adherents

Uniformize code.

2014-09-28 16:31:37 +02:00

admin

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

2014-09-29 14:01:40 +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

Migrated old error notifications to the """new""" system

2014-07-20 01:43:46 +02:00

bookmarks

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

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

boutique

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

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

cashdesk

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00

categories

Uniformize code for error reporting after a hook.

2014-09-28 03:41:32 +02:00

comm

Fix: Change for php 5.6

2014-09-29 13:21:03 +02:00

commande

Merge pull request #1925 from tiaris/develop

2014-09-29 15:40:31 +02:00

compta

Merge pull request #1925 from tiaris/develop

2014-09-29 15:40:31 +02:00

conf

Clean path dolibarr_main_url_root to avoid duplicate /.

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

contact

Uniformize code.

2014-09-28 16:31:37 +02:00

contrat

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

2014-09-29 16:01:49 +02:00

core

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

2014-09-29 16:01:49 +02:00

cron

Uniformize code $_SERVER["PHP_SELF"]

2014-09-18 20:13:38 +02:00

ecm

Fix: Message show when dir is out of sync with database cache was wrong.

2014-09-03 16:09:14 +02:00

expedition

Uniformize code for error reporting after a hook.

2014-09-28 03:41:32 +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

Uniformize code for error reporting after a hook.

2014-09-28 03:41:32 +02:00

fourn

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

2014-09-29 16:01:49 +02:00

ftp

Revert "Scrutinizer Auto-Fixes"

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

holiday

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

2014-09-28 02:14:32 +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

Add cache excel export on harddrive with

2014-09-29 10:16:48 +02:00

langs

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

2014-09-29 16:01:49 +02:00

livraison

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00

mailmanspip

Revert "Scrutinizer Auto-Fixes"

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

margin

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

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

opensurvey

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00

paybox

Migrated old message notifications to the """new""" system

2014-07-20 00:10:40 +02:00

paypal

Revert "Scrutinizer Auto-Fixes"

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

printipp

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

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

product

Uniformize code for error reporting after a hook.

2014-09-28 03:41:32 +02:00

projet

Fix: use "doc" instead "pdf" dir and uniformize code

2014-09-29 11:08:50 +02:00

public

Uniformize code $_SERVER["PHP_SELF"]

2014-09-18 20:13:38 +02:00

resource

Uniformize code for error reporting after a hook.

2014-09-28 03:41:32 +02:00

societe

Uniformize code.

2014-09-28 16:31:37 +02:00

support

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

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

theme

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

2014-09-15 22:58:39 +02:00

user

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

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

webservices

Merge pull request #1923 from GPCsolutions/fixws

2014-09-29 15:39:19 +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

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

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

master.inc.php

trigger on total

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

robots.txt

…

viewimage.php

…