Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,061 Commits 36 Branches 189 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

233 Commits

Author SHA1 Message Date
Laurent Destailleur
803fe68061 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2016-08-01 15:01:14 +02:00
Laurent Destailleur
45d354ad82 Fix variable names MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN... 2016-07-29 22:58:39 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
86e4340287 FIX: More robust autodetection of relative url to redirect to make 
install when conf file does not exists yet.
 2016-07-27 10:57:05 +02:00
Laurent Destailleur
c0d8bce2df Prepare 3.8.5 2016-07-21 19:44:25 +02:00
Laurent Destailleur
87c31d0761 Prepare 3.9.3 2016-07-16 19:38:58 +02:00
Laurent Destailleur
ec03ea8f70 Dev branch is now 5.0 alpha 2016-07-14 15:33:17 +02:00
Laurent Destailleur
d22ef4f371 Fix Do not show status 2016-07-06 22:35:12 +02:00
phf
b3a36688d1 Fix #2666 2016-06-04 14:31:53 +02:00
Laurent Destailleur
755b994750 Prepare 3.9.2 2016-04-29 20:40:00 +02:00
Laurent Destailleur
0ef1be9364 Prepare 3.9.1 2016-04-22 18:07:34 +02:00
Marcos García de La Fuente
257d9b2f8d NEW #4772 Removed support for Mysql deprecated driver. Please use Mysqli instead 2016-04-17 15:39:46 +02:00
Laurent Destailleur
77c81397ea Version 3.9 final 2016-03-13 20:17:49 +01:00
Laurent Destailleur
9a0af064bf Prepare rc2 2016-02-26 19:05:02 +01:00
Laurent Destailleur
051b412c17 Remove security fix 2016-02-15 01:16:01 +01:00
abb
3e6eca546a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev 
Conflicts:
	htdocs/fichinter/card.php
	htdocs/langs/en_US/products.lang
 2016-02-15 00:06:51 +01:00
Laurent Destailleur
cc174daa13 Prepare 3.8.4 2016-02-14 20:12:47 +01:00
Laurent Destailleur
58f728eae5 Prepare 3.9rc 2016-02-06 15:11:45 +01:00
Laurent Destailleur
3f7d6a95f4 Prepare 4.0 dev 2016-01-10 11:57:40 +01:00
Laurent Destailleur
e536e10269 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
 2015-12-27 19:06:31 +01:00
Laurent Destailleur
06754068ff Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
 2015-12-27 19:02:19 +01:00
Laurent Destailleur
96bc2023f3 Prepare package 3.6.6 2015-12-27 18:56:15 +01:00
Laurent Destailleur
bd91f327b8 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/filefunc.inc.php
 2015-12-19 01:38:22 +01:00
Laurent Destailleur
298396a57e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	test/phpunit/AllTests.php
 2015-12-19 01:27:19 +01:00
Laurent Destailleur
0df45f10c1 Fix travis 2015-12-19 01:09:42 +01:00
Laurent Destailleur
a136e90749 Fix travis 2015-12-19 01:06:11 +01:00
Raphaël Doursenaud
bbe7498de6 Better Travis CI 
NEW:
Cleaned up routines for better readability of both declaration and results.
PHP versions now really covered.
    The old code forced install of PHP and didn't use Travis provided versions.
    This resulted in the process not being executed with the declared PHP version.
Dropped MySQL in favor of MariaDB.
    This is now the FLOSS community standard.
    This should help avoid problems with buggy MySQL releases.
Fast finish enabled to show results faster.
Optimized tools installation with composer.
    The right version of the tool is installed for the PHP version under test.
New PHP linter to check for syntax errors.
    Parallelized for better speed.
Apache + PHP FPM for testing webservices.
    The previous mod_php configuration was not supported on Travis.
New global DEBUG environment variable to show verbose output with configuration files content.
IRC notification on #dolibarr@freenode for community awareness.

FIXES:
Bug in scripts preventing execution with environmentalized PHP.
Wrong detection of MAIN_URL_ROOT under specific circumstances.
    $_SERVER["DOCUMENT_ROOT"] empty and $_SERVER["SCRIPT_NAME"] populated.
Relative ignore directive in coding style ruleset to avoid bypassing test.
Unit test errors without an exit status.
    This prevented the CI from properly detecting and reporting the error.

TODOS:
PostgreSQL support.
    This one is tricky since we only have a MySQL dump and the syntax is not directly compatible.
SQLite support.
    Disabled in core at the moment.
Nginx + PHP FPM support.
    Test webservices on the second most popular webserver.
Run dev/* checks.
    We have a nice collection of scripts we could leverage.
Check Javascript.
Check CSS.
Check SQL.
 2015-12-13 21:34:36 +01:00
abb
613209eadb confs sur filefunc 2015-12-11 12:14:46 +01:00
Raphaël Doursenaud
c3ed30ffd8 Moved to new package for TCPDF 
Previous one has been deprecated by upstream
 2015-11-09 12:21:08 +01:00
Laurent Destailleur
6a9342f5a3 Move default application name into one place (as a constant) 2015-11-04 14:54:17 +01:00
Laurent Destailleur
6a90431cf1 Prepare 3.8.2 2015-10-19 14:04:47 +02:00
Laurent Destailleur
12a08ae4e1 Prepare 3.8.1 2015-09-23 10:25:06 +02:00
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
Laurent Destailleur
8076ea85ea 3.6.4 was packaged 2015-09-05 20:07:17 +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
Laurent Destailleur
4f75ab79db Prepare 3.7.2 2015-06-01 16:32:33 +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
cabbb9e421 Merge remote-tracking branch 'origin/3.5' into 3.6 
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
 2015-05-16 16:49:03 +02:00
Laurent Destailleur
80943111cc Prepare 3.5.7 2015-05-16 15:26:34 +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