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

develop

Conflicts:
	ChangeLog
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/resultat/index.php

2014-09-16 21:09:53 +02:00

..

accountancy

Add linkback into accountancy admin

2014-09-09 22:34:49 +02:00

adherents

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

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

admin

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

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

asterisk

…

barcode

…

bookmarks

…

boutique

…

cashdesk

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

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

categories

Merge

2014-09-07 12:22:04 +02:00

comm

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

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

commande

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

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

compta

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

2014-09-16 21:09:53 +02:00

conf

Clean path dolibarr_main_url_root to avoid duplicate /.

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

contact

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

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

contrat

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

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

core

Qual: Remove unused code

2014-09-16 11:19:22 +02:00

cron

Fix: Bad url for cron

2014-07-28 20:33:37 +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

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

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

exports

Fix: Missing field tobuy into service export.

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

externalsite

…

fichinter

Qual: Uniformize var $backtopage (no more $backtourl vars)

2014-09-15 19:14:10 +02:00

fourn

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

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

ftp

…

holiday

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

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

imports

…

includes

Fix: Missing source

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

install

New: Add hourly and daily amount on user card. Add weekly working hours

2014-09-13 17:41:26 +02:00

langs

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

2014-09-16 21:09:53 +02:00

livraison

Qual: Uniformize var $backtopage (no more $backtourl vars)

2014-09-15 19:14:10 +02:00

mailmanspip

…

margin

Fix: Too many parameter

2014-08-01 14:26:13 +02:00

opensurvey

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

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

paybox

…

paypal

…

printipp

…

product

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

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

projet

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

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

public

Fix: Unsubscribe emailing not working

2014-09-01 18:26:24 +02:00

resource

Merge

2014-09-07 12:22:04 +02:00

societe

Qual: Remove unused code

2014-09-16 11:19:22 +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

Add lost PR

2014-09-14 12:06:38 +02:00

webservices

Merge branch 'Upstream/develop'

2014-08-18 11:56:49 +02:00

.gitignore

Complete ignore

2014-08-14 15:09:17 +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

Clean path dolibarr_main_url_root to avoid duplicate /.

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

index.php

Fix: New: Differentiate text and img for better accessibility.

2014-07-29 20:21:01 +02:00

main.inc.php

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

2014-08-13 19:25:55 +02:00

master.inc.php

trigger on total

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

robots.txt

…

viewimage.php

…