Laurent Destailleur 4a1f6713ff Merge remote-tracking branch 'origin/3.4' into 3.5 ...

Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang

2013-11-21 18:45:33 +01:00

..

accountancy

…

adherents

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

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

admin

New: Add links to social networks

2013-11-16 15:40:46 +01:00

asterisk

…

bookmarks

…

boutique

Doxygen

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

cashdesk

CSS fixes

2013-09-05 20:54:19 +02:00

categories

Fix: If no permission to edit object, form to change category must be

2013-11-21 16:34:38 +01:00

comm

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

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

commande

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

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

compta

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

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

conf

Doxygen: More comments

2013-09-18 17:59:57 +02:00

contact

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

2013-11-15 15:41:37 +01:00

contrat

Make AJAX new line form work again

2013-11-19 17:54:36 +01:00

core

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

2013-11-20 23:48:06 +01:00

cron

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

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

ecm

Fix: tons of bugs into ecm module

2013-11-17 02:59:01 +01:00

expedition

fix : language

2013-11-05 15:29:33 +01:00

exports

New: Can cancel holidays that were previously validated

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

externalsite

…

fichinter

included the FormContract class to avoid fatal error

2013-11-19 14:23:17 +01:00

fourn

Fix: Missing hook declaration

2013-11-20 14:29:50 +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

Qual: Uniformize code. No useless redirect. use GETPOST.

2013-09-06 13:25:45 +02:00

includes

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

2013-11-20 23:48:06 +01:00

install

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

2013-11-20 12:46:05 +01:00

langs

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

2013-11-21 18:45:33 +01:00

livraison

Fix: Use correct translation key

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

mailmanspip/class

Fix: Missing class

2013-08-31 16:58:25 +02:00

margin

Fix : SQL error on margin page

2013-11-08 10:08:01 +01:00

opensurvey

fix: minor syntax rules

2013-11-06 12:53:43 +01:00

paybox

…

paypal

…

printipp

…

product

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

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

projet

renamed templates

2013-11-06 10:22:01 +01:00

public

Minor fix in cron feature

2013-11-18 11:42:28 +01:00

societe

Revert "Qual: Removed not used file"

2013-11-20 09:34:54 +01:00

support

Fix: Removed deprecated support links

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

theme

Fix: avoid scroll

2013-11-13 20:37:05 +01:00

user

Use mtethos Post instead of get

2013-11-20 00:46:04 +01:00

webservices

WebService contact with statut (the new field)

2013-11-14 19:41:27 +01:00

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 3.5.0 beta

2013-11-07 00:41:27 +01:00

index.php

…

main.inc.php

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

2013-11-21 18:45:33 +01:00

master.inc.php

…

robots.txt

…

viewimage.php

…