Laurent Destailleur f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 ...

Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php

2014-09-13 19:10:05 +02:00

..

accountancy

Qual: remove PHP closing tag (again)

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

adherents

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

2014-09-13 19:10:05 +02:00

admin

Fix SQL syntax

2014-08-31 12:38:33 +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

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

2014-09-13 19:10:05 +02:00

categories

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

2014-09-06 00:26:11 +02:00

comm

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

2014-09-13 19:10:05 +02:00

commande

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

2014-09-13 19:10:05 +02:00

compta

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

2014-09-13 19:10:05 +02:00

conf

…

contact

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

2014-09-13 19:10:05 +02:00

contrat

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

2014-09-13 19:10:05 +02:00

core

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

2014-09-13 19:10:05 +02:00

cron

Fix: Bad url for cron

2014-07-28 20:33:37 +02:00

ecm

…

expedition

Little fix

2014-09-07 10:07:26 +02:00

exports

Fix: Missing field tobuy into service export.

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

externalsite

…

fichinter

Fix: Bad use of fetch_lines

2014-09-04 19:03:48 +02:00

fourn

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

2014-09-13 19:10:05 +02:00

ftp

…

holiday

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

2014-09-13 19:10:05 +02:00

imports

…

includes

Upgrade tcpdf to 6.0.093 to get fixes and solve a problem of licence.

2014-09-07 11:00:54 +02:00

install

Fix llx_c_type_resource when you update from a 3.6-beta

2014-08-26 04:35:22 +02:00

langs

Merge pull request #1857 from aternatik/resource-fix

2014-09-02 19:35:06 +02:00

livraison

Fix: Bad use of fetch_lines

2014-09-04 19:03:48 +02:00

mailmanspip/class

…

margin

Prepare 3.6.

2014-07-26 18:10:51 +02:00

opensurvey

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

2014-09-13 19:10:05 +02:00

paybox

…

paypal

Qual: remove PHP closing tag (again)

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

printipp

…

product

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

2014-09-13 19:10:05 +02:00

projet

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

2014-09-13 19:10:05 +02:00

public

Fix: Unsubscribe emailing not working

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

resource

Fix : missing actions for resource element

2014-08-30 11:11:32 +02:00

societe

Fix: pgsql compatibility. No upper cas into field names.

2014-09-04 20:17:25 +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 3.6

2014-09-13 19:10:05 +02:00

user

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

2014-08-16 17:37:37 +02:00

webservices

Qual: remove PHP closing tag (again)

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

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 3.6.

2014-07-26 18:10:51 +02:00

index.php

Fix: When option to use optimize display for text borwser and blin

2014-07-29 00:50:57 +02:00

main.inc.php

Fix: When jmobile is forced, we force enable of javascript.

2014-08-08 14:37:51 +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

…