Laurent Destailleur
|
01aad8516d
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
|
2015-05-31 03:30:38 +02:00 |
|
Laurent Destailleur
|
11d4a945b0
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
|
2015-05-25 18:08:23 +02:00 |
|
Raphaël Doursenaud
|
becc240b92
|
Include Categories class whenever Categorie::TYPE is used
|
2015-05-23 23:35:49 +02:00 |
|
Raphaël Doursenaud
|
ee808cdfd7
|
Added types constants to categories
|
2015-05-23 18:52:31 +02:00 |
|
jfefe
|
f5db4d5bb7
|
Fix: missing getEntity function
|
2015-04-19 03:05:37 +02:00 |
|
Laurent Destailleur
|
95029516db
|
Field note was renamed.
|
2015-04-14 19:46:49 +02:00 |
|
Laurent Destailleur
|
e3713c8b6d
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
|
2015-02-19 00:01:26 +01:00 |
|
Laurent Destailleur
|
4e6d5e1cd1
|
New: Add filter fields on the subscription list
|
2015-02-14 19:10:40 +01:00 |
|
Marcos García de La Fuente
|
157a6e109e
|
Misc Adherents PHPDoc corrections
|
2015-02-10 10:45:48 +01:00 |
|
Philippe GRAND
|
27c0e6b4d3
|
balise form should close after table
|
2014-12-15 19:15:26 +01:00 |
|
Frédéric FRANCE
|
e7f9b9bf1b
|
Update /adherents/list.php
|
2014-11-23 17:43:57 +01:00 |
|
Frédéric FRANCE
|
09f1f79f4e
|
Update /adherents/list.php
|
2014-11-23 09:46:24 +01:00 |
|
aspangaro
|
0b20369dd7
|
Qual: Renamed all files & links "fiche.php" into "card.php"
|
2014-09-18 21:18:25 +02:00 |
|
aspangaro
|
b22aef3521
|
Qual: Renamed all files & links "liste.php" into "list.php"
|
2014-09-18 20:33:37 +02:00 |
|