Laurent Destailleur 06aa3b8250 Merge branch 'opensurvey-improvements' of ...

https://github.com/marcosgdf/dolibarr into
marcosgdf-opensurvey-improvements

Conflicts:
	ChangeLog

2014-01-12 14:50:00 +01:00

..

accountancy

…

adherents

Fix: Missing condition

2013-12-14 14:21:27 +01:00

admin

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

2014-01-07 16:41:00 +01:00

asterisk

…

barcode

Missing lang file

2014-01-08 15:50:11 +01:00

bookmarks

Added missing language loads for bookmarks

2013-12-10 12:04:07 +01:00

boutique

Doxygen

2013-11-20 12:55:13 +01:00

cashdesk

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

2013-12-24 16:28:27 +01:00

categories

Fix: Bugs into permissions for module category

2014-01-07 15:35:26 +01:00

comm

Qual: Mutualize code for actions of editing notes

2014-01-11 13:33:30 +01:00

commande

Qual: Mutualize code for actions of editing notes

2014-01-11 13:33:30 +01:00

compta

Qual: Mutualize code for actions of editing notes

2014-01-11 13:33:30 +01:00

conf

…

contact

Qual: Mutualize code for actions of editing notes

2014-01-11 13:33:30 +01:00

contrat

Qual: Mutualize code for actions of editing notes

2014-01-11 13:33:30 +01:00

core

Merge branch 'opensurvey-improvements' of

2014-01-12 14:50:00 +01:00

cron

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

2013-11-19 21:08:02 +01:00

ecm

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

2013-12-08 00:42:36 +01:00

expedition

Qual: Mutualize code for actions of editing notes

2014-01-11 13:33:30 +01:00

exports

Removed some FIXME

2013-12-15 14:26:27 +01:00

externalsite

…

fichinter

Qual: Mutualize code for actions of editing notes

2014-01-11 13:33:30 +01:00

fourn

Qual: Mutualize code for actions of editing notes

2014-01-11 13:33:30 +01:00

ftp

FTP connections are resources

2013-11-07 21:48:45 +01:00

holiday

New: Can cancel holidays that were previously validated

2013-09-24 18:06:07 +02:00

imports

…

includes

Provide a new constant about odt2pdf mangement : Don't remove odt source

2014-01-06 20:07:15 +01:00

install

Modified migration script to not remove columns

2014-01-06 05:39:22 +01:00

langs

Merge branch 'opensurvey-improvements' of

2014-01-12 14:50:00 +01:00

livraison

Fix: Use correct translation key

2013-09-25 19:07:25 +02:00

mailmanspip/class

…

margin

fix: doxygen

2013-12-16 14:16:01 +01:00

opensurvey

If user does not have an email and option “Mailsonde” is active, then we show a warning

2014-01-06 05:29:07 +01:00

paybox

…

paypal

Fix: Bad parameter that duplicate info.

2013-12-07 03:23:14 +01:00

printipp

…

product

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

2014-01-07 16:41:00 +01:00

projet

Qual: Mutualize code for actions of editing notes

2014-01-11 13:33:30 +01:00

public

New: For paypal payment confirmation, send email ok only if payment is

2014-01-07 17:35:33 +01:00

societe

Qual: Mutualize code for actions of editing notes

2014-01-11 13:33:30 +01:00

support

Fix: Removed deprecated support links

2013-11-16 15:08:57 +01:00

theme

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

2014-01-07 16:41:00 +01:00

user

Removed some FIXME

2013-12-15 14:26:27 +01:00

webservices

allow the webservice to create a private individual

2013-12-20 17:03:24 +01:00

.gitignore

Update ignore file

2013-12-10 22:58:39 +01:00

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

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

2013-12-31 16:13:12 +01:00

index.php

…

main.inc.php

Replaced use of htmlentities with dol_htmlentities

2014-01-05 21:08:37 +01:00

master.inc.php

Better error wording

2013-11-29 17:23:42 +01:00

robots.txt

…

viewimage.php

…