Laurent Destailleur
9cbd236c8c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Laurent Destailleur
3b01b8cb47
Fix security hole
2015-09-13 22:50:08 +02:00
Laurent Destailleur
7c030a114d
Release 3.8.0
2015-09-13 19:26:20 +02:00
Laurent Destailleur
3333970eb4
Prepare 3.9
2015-09-07 13:23:51 +02:00
Raphaël Doursenaud
e0312d048b
Install TCPDF from composer
2015-09-04 19:06:04 +02:00
Raphaël Doursenaud
1b7ed43c60
Install PHPExcel from composer
2015-09-04 19:06:02 +02:00
Laurent Destailleur
66ae756c72
Prepare 3.8
2015-07-12 23:47:39 +02:00
Florian HENRY
6819e295f5
default charset utf-8
2015-06-16 20:22:01 +02:00
Raphaël Doursenaud
ea798c2315
Qual: deprecate dol_json_encode() and dol_json_decode()
...
PHP > 5.3 supports json_encode() and json_decode() natively
2015-06-01 11:00:11 +02:00
Laurent Destailleur
fe3f701928
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
htdocs/expedition/list.php
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/user/class/user.class.php
2015-05-16 17:09:42 +02:00
Laurent Destailleur
92a25e3d4c
Prepare 3.7.1
2015-05-12 00:11:51 +02:00
Laurent Destailleur
5a9c40eb59
Fix minor look and security errors
2015-04-21 12:03:51 +02:00
Laurent Destailleur
7a4d1d990e
Fix security hole
2015-04-21 11:41:21 +02:00
bafbes
f4fe71a7fe
Update filefunc.inc.php
2015-04-18 20:59:00 +01:00
bafbes
4c8dc1ba5b
NEW : dev feature : replace conf filename with "conf" parameter on url by GET
2015-04-18 15:26:33 +01:00
Marcos García de La Fuente
4349f27299
Revert "Revert "Refactor 1""
2015-03-23 01:39:12 +01:00
Laurent Destailleur
2d90256640
Revert "Refactor 1"
2015-03-22 12:51:29 +01:00
Marcos García de La Fuente
7a2e60bb65
No need to PHP < 5.3.0 compatibility
2015-03-04 10:45:30 +01:00
Laurent Destailleur
2f24622a7c
NEW: Introduce TCPDI as replacement of FPDI.
2015-03-02 01:38:40 +01:00
Laurent Destailleur
3848daeab8
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
htdocs/product/stats/facture.php
2014-12-30 04:20:50 +01:00
Laurent Destailleur
953e736a97
Prepare version 3.6.2
2014-12-27 02:21:37 +01:00
Laurent Destailleur
1e8e4e7fda
Prepare 3.8 dev
...
Fix bad test.
Renamed table for dynamic prices.
2014-12-03 17:06:44 +01:00
Laurent Destailleur
2f5c7e5f9d
Prepare version 3.7 beta
2014-10-30 19:28:22 +01:00
Laurent Destailleur
b8969edcc5
Prepare 3.6.1
2014-09-27 12:34:45 +02:00
Laurent Destailleur
0514fa02d5
Clean path dolibarr_main_url_root to avoid duplicate /.
2014-08-06 00:06:27 +02:00
Laurent Destailleur
db091896a5
Prepare 3.6.
...
Use google adsense tag of foundation for doxygen doc pages.
Version is no more encoded int odoxygen.
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/impayees.php
htdocs/filefunc.inc.php
2014-07-26 18:10:51 +02:00
Laurent Destailleur
a8547e9c4d
Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne
...
s'appliquent pas
2014-07-26 17:30:10 +02:00
Laurent Destailleur
e2790895ad
Prepare 3.7 development.
2014-06-26 21:48:57 +02:00
Laurent Destailleur
5853b9eb30
Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1416
Conflicts:
ChangeLog
2014-06-10 01:37:43 +02:00
Laurent Destailleur
fd271d7c92
Fix: Missing to set version to beta
2014-05-14 14:09:57 +02:00
Laurent Destailleur
1c6c79811d
Prepare version 3.5.3
2014-05-06 16:09:13 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
c8f63d6160
Fix: Prepare for 3.5.2
2014-03-14 00:17:39 +01:00
Laurent Destailleur
6a84a7f935
Prepare version 3.5.1
2014-02-08 13:56:28 +01:00
Laurent Destailleur
0bdcda50c6
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
build/exe/doliwamp/doliwamp.iss
build/pad/pad_dolibarr.xml
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
2013-12-31 16:13:12 +01:00
Laurent Destailleur
b1ea05e0d1
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2013-12-31 15:55:10 +01:00
Laurent Destailleur
0e54780377
Fix: Update doc and packager for doliwamp
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
2013-12-31 15:41:25 +01:00
Laurent Destailleur
247c49e094
Prepare 3.5.0 release
2013-12-31 15:17:10 +01:00
Laurent Destailleur
b8141ef2db
Prepare 3.6 dev
2013-11-22 19:32:36 +01:00
Laurent Destailleur
db9e9a3372
Prepare 3.5.0 beta
2013-11-07 00:41:27 +01:00
Laurent Destailleur
84b36d1230
Prepare for 3.4.2
2013-11-01 17:24:09 +01:00
Laurent Destailleur
8203971614
Try to fix bug [ bug #1072 ] Wrong DOL_URL_ROOT value calculated
...
Conflicts:
htdocs/filefunc.inc.php
2013-10-23 18:33:56 +02:00
Laurent Destailleur
2dad13a5c4
Try to fix bug [ bug #1072 ] Wrong DOL_URL_ROOT value calculated
2013-10-23 17:47:46 +02:00
Laurent Destailleur
04752dbfbe
Doxygen: More comments
2013-09-18 17:59:57 +02:00
Laurent Destailleur
f45be6a2a7
Prepare for 3.4.1
...
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
build/debian/changelog
2013-09-06 01:37:07 +02:00
Laurent Destailleur
afae841ae4
Fix: Permissions on files
2013-08-06 00:36:21 +02:00
Laurent Destailleur
ae9c3cd780
Prepare 3.3.4
2013-07-26 16:43:06 +02:00
Laurent Destailleur
b5820315f9
Fix: Correct permissions on files
2013-07-13 10:34:19 +02:00
Laurent Destailleur
f94f516a12
Clean code for managing alternate root dirs.
2013-07-09 23:46:31 +02:00
Laurent Destailleur
0de1fe893a
Prepare 3.4
2013-07-07 13:30:30 +02:00