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

Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php

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

..

accountancy

Qual: remove PHP closing tag (again)

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

adherents

Prepare 3.6.

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

admin

Fix: Can not set option when using in nojs mode.

2014-08-03 22:08:25 +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

Fix: security

2014-05-28 19:38:30 +02:00

categories

Categorie class was fetching an object even if no param passed

2014-07-25 14:11:31 +02:00

comm

Fix: Field for user into event is "owner".

2014-08-03 23:32:36 +02:00

commande

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

2014-07-14 23:36:10 +02:00

compta

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

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

conf

Qual: Better error message for LDAP connection

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

contact

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

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

contrat

Fix: Price by customer

2014-08-01 13:25:29 +02:00

core

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

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

cron

Fix: Bad url for cron

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

ecm

Removed closing php tag

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

expedition

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

2014-08-04 22:18:30 +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

Fix: form is not allowed inside a table

2014-07-06 21:16:27 +02:00

fourn

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

2014-08-06 21:34:47 +02:00

ftp

Removed closing php tag

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

holiday

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

2014-08-06 09:12:29 +02:00

imports

Fix: [ bug #1384 ] Wrong name for import products and product prices

2014-05-11 17:52:16 +02:00

includes

Fix: missing skin.js

2014-07-31 11:15:30 +02:00

install

Fix: Clean data

2014-08-04 00:15:23 +02:00

langs

Fix: Field for user into event is "owner".

2014-08-03 23:32:36 +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

Prepare 3.6.

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

opensurvey

Fix: date was not saved if not in future.

2014-07-26 19:02:32 +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

Fix: Price by customer: a client must be able to have multiple products

2014-08-01 18:22:39 +02:00

projet

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

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

public

Fix: Bad param

2014-08-01 17:13:23 +02:00

resource

Qual: remove PHP closing tag (again)

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

societe

Fix: When there is an error to update a thirdparty, the number for

2014-08-05 18:28:06 +02:00

support

Qual: remove PHP closing tag (again)

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

theme

Add more colors to fix pb with agenda

2014-08-04 00:15:08 +02:00

user

Fix: get_full_tree was not working correctly.

2014-08-07 20:21:16 +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: bad regex syntax

2014-08-07 12:47:14 +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

…