Laurent Destailleur 9444e8d63d Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git ...

into develop

Conflicts:
	htdocs/admin/boxes.php
	htdocs/admin/ihm.php
	htdocs/core/lib/usergroups.lib.php
	htdocs/main.inc.php

2011-11-02 22:51:52 +01:00

..

menus

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

system

Fix: DST is correctly detected

2011-11-01 04:57:45 +01:00

tools

New: Add trigger ACTION_DELETE and ACTION_MODIFY

2011-11-01 13:22:39 +01:00

accounting.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

agenda_extsites.php

Edit comments

2011-10-25 00:43:37 +02:00

agenda_xcal.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

agenda.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

barcode.php

Fix: Some fix for barcode generation

2011-10-26 12:58:10 +02:00

boxes.php

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

2011-11-02 22:51:52 +01:00

clicktodial.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

commande.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

company.php

[task #216] Move lib in core directory

2011-10-24 12:59:44 +02:00

compta.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

confexped.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

const.php

Fix: uniform and clean code

2011-10-25 11:24:06 +02:00

contract.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

delais.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

dict.php

[task 189] Move Error* key from other.lang into errors.lang files

2011-10-29 23:52:05 +02:00

dons.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

events.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

expedition.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

external_rss.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

facture.php

Fix: uniform and clean code

2011-10-25 11:24:06 +02:00

fckeditor.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

fichinter.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

fournisseur.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

geoipmaxmind.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

ihm.php

Security: Fix more security holes

2011-11-02 22:15:59 +01:00

index.php

Fix: remove obsolete tags (in progress)

2011-08-27 14:24:16 +00:00

ldap_contacts.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

ldap_groups.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

ldap_members.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

ldap_users.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

ldap.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

limits.php

[task #216] Move lib in core directory

2011-10-24 12:59:44 +02:00

livraison.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

mailing.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

mails.php

[task #216] Move lib in core directory

2011-10-24 12:59:44 +02:00

menus.php

Fix: Format error

2011-11-02 18:02:31 +01:00

modules.php

Better error management

2011-11-02 14:15:14 +01:00

notification.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

osc-languages.php

Fix: Solve phpcodesniffer errors and warning

2011-09-14 21:50:18 +00:00

pdf.php

[task #216] Move lib in core directory

2011-10-24 12:59:44 +02:00

perms.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

prelevement.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

project.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

propale.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

proxy.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

security_other.php

[task #216] Move lib in core directory

2011-10-24 12:59:44 +02:00

security.php

[task #217] Move core files in core directory

2011-10-24 14:11:49 +02:00

sms.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

stock.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

syslog.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

taxes.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

triggers.php

Fix: remove obsolete tags (in progress)

2011-08-27 14:24:16 +00:00

user.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

workflow.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00