Laurent Destailleur
|
1d8b9949d6
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/compta/bank/categ.php
htdocs/compta/bank/releve.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/contacts.tpl.php
htdocs/cron/list.php
htdocs/main.inc.php
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/theme/bureau2crea/style.css.php
htdocs/theme/eldy/style.css.php
htdocs/user/class/user.class.php
htdocs/viewimage.php
|
2013-06-24 20:02:02 +02:00 |
|
Regis Houssin
|
4cd6ae6bbd
|
Fix: convert lines delimiters
|
2013-06-24 17:36:33 +02:00 |
|
Regis Houssin
|
05bd035488
|
Fix: convert line delimiters
|
2013-06-24 17:34:22 +02:00 |
|
Laurent Destailleur
|
871c3d9d07
|
Fix: debug module cron
|
2013-06-23 22:30:33 +02:00 |
|
Laurent Destailleur
|
ec2e3db450
|
New: Switch cron module to status stable. Thanks to everybody to test
this new module and debug it.
|
2013-06-23 22:21:21 +02:00 |
|
Regis Houssin
|
c9a71439b2
|
Fix: EOF
|
2013-06-05 16:24:32 +02:00 |
|
Laurent Destailleur
|
bcacbab481
|
Qual: No need to use two menu entries for this.
|
2013-04-17 16:26:14 +02:00 |
|
Laurent Destailleur
|
9449345395
|
Another step for menu management rewriting
|
2013-04-01 20:15:52 +02:00 |
|
Laurent Destailleur
|
da8932f987
|
Some fix for cron module
|
2013-03-27 13:24:26 +01:00 |
|
Laurent Destailleur
|
8c053b2f8d
|
Debug module cron
|
2013-03-26 21:18:01 +01:00 |
|
Laurent Destailleur
|
350bcea183
|
Merge
|
2013-03-22 17:10:17 +01:00 |
|