Laurent Destailleur
|
5c5ff72ecd
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
|
2015-01-18 17:13:42 +01:00 |
|
Marcos García de La Fuente
|
7f59cf9194
|
Fix: [ bug #1787 ] Incorrect behaviour of doActions hook
|
2015-01-17 19:28:27 +01:00 |
|
aspangaro
|
aa8c165f06
|
Presentation
|
2014-11-23 21:03:34 +01:00 |
|
Laurent Destailleur
|
a99bd1c835
|
Fix: Fix permission on files.
|
2014-10-17 15:30:38 +02:00 |
|
Regis Houssin
|
a2446e51db
|
New: add context "globalcard" for declaring only once all cards
|
2014-10-06 07:20:58 +02:00 |
|
Laurent Destailleur
|
ec95aacd52
|
Uniformize code for error reporting after a hook.
|
2014-09-28 03:41:32 +02:00 |
|
Raphaël Doursenaud
|
c48c3a9d91
|
Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
|
2014-05-26 13:51:25 +02:00 |
|
jfefe
|
e7dfdd27b1
|
Fix: filter on POST value too restrictive
|
2014-05-11 12:33:49 +02:00 |
|
jfefe
|
e9453437f1
|
New : delete resource
|
2014-05-11 12:12:17 +02:00 |
|
jfefe
|
ba1fc07037
|
Uniformize langage files
|
2014-05-11 00:38:03 +02:00 |
|
Jean-François Ferry
|
a76fef5f35
|
Work on resource list / navbar into card
|
2014-05-10 22:07:13 +02:00 |
|
Jean-François Ferry
|
e4962e9efd
|
Add resource card
|
2014-05-10 22:07:13 +02:00 |
|