Laurent Destailleur
|
1cf2276584
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/comm/prospect/list.php
|
2013-04-05 22:59:06 +02:00 |
|
fhenry
|
9572eebae0
|
Check style
(http://www.dolibarr.fr/forum/3-installation/40712-sauvegarde)
|
2013-04-02 22:22:57 +02:00 |
|
Laurent Destailleur
|
d11cee399a
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
|
2013-01-16 15:45:17 +01:00 |
|
Laurent Destailleur
|
8d206fdfb0
|
Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
|
2013-01-16 15:36:08 +01:00 |
|
Regis Houssin
|
9812c91aff
|
Fix: wrong EOL !!!!!!!
|
2013-01-10 08:27:12 +01:00 |
|
Regis Houssin
|
b838895db9
|
Fix: change for a neutral email
|
2012-12-30 15:13:49 +01:00 |
|
Regis Houssin
|
5740c7e694
|
Fix: change for a neutral email
|
2012-12-30 15:11:07 +01:00 |
|
Laurent Destailleur
|
ca6e9643ea
|
Fix: Pb in json function for objects
|
2012-12-29 12:21:13 +01:00 |
|
Laurent Destailleur
|
17a3204578
|
Fix: dol_json_encode was wrong with objects
|
2012-12-29 06:51:12 +01:00 |
|
Laurent Destailleur
|
70cf195fb4
|
Fix: removed test code
|
2012-10-19 09:34:31 +02:00 |
|
Laurent Destailleur
|
657d0197b6
|
Fix: json is a fuck... sh... 3 hours to find a bug ! (json fails
without any warning when converting non utf8 strings).
|
2012-10-18 16:30:12 +02:00 |
|
Laurent Destailleur
|
1347ecf14e
|
Qual: Removed warnings
|
2012-09-19 12:49:58 +02:00 |
|
Regis Houssin
|
6f1651309e
|
Fix: global converting lines delimiter
|
2012-07-02 19:30:37 +02:00 |
|
Laurent Destailleur
|
81eadcd426
|
Fix: Avoid warning if param is empty
|
2012-06-15 10:05:28 +02:00 |
|
Laurent Destailleur
|
c592bc88b8
|
Fix: Init
|
2012-06-15 02:17:00 +02:00 |
|
Regis Houssin
|
d7d5681b4b
|
Fix: avoid phpunit warning
|
2012-03-26 08:18:03 +02:00 |
|
Laurent Destailleur
|
693d0441b3
|
Fix: json emulated function now support utf8 char.
|
2012-03-25 14:25:32 +02:00 |
|