Commit Graph

51073 Commits

Author SHA1 Message Date
Laurent Destailleur
af85ade7ff Minor css fix 2015-12-15 10:24:31 +01:00
Laurent Destailleur
40269c3c70 Fix Remove syntax warnings 2015-12-15 09:43:39 +01:00
Laurent Destailleur
750443040a Enhance ruleset.xml description 2015-12-15 09:29:21 +01:00
Laurent Destailleur
ed88a4c398 Fix css 2015-12-14 21:38:04 +01:00
Laurent Destailleur
0ec62c05cc Fix bad var name. Removed warning. 2015-12-14 09:14:34 +01:00
Laurent Destailleur
96d1486358 Merge pull request #4209 from GPCsolutions/dolibarr-travis
Better Travis CI
2015-12-14 01:11:55 +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
Laurent Destailleur
dc6ec91b2c Merge pull request #4183 from IonAgorria/patch-3
JS error preventing hiding of dates at object line
2015-12-13 19:57:37 +01:00
Laurent Destailleur
da8e38b253 Merge pull request #4213 from grandoc/develop
[Qual] Uniformize code
2015-12-13 19:56:43 +01:00
Laurent Destailleur
b949468b75 Merge pull request #4210 from IonAgorria/pricesel-fix
Price expression selector fix
2015-12-13 19:56:32 +01:00
Laurent Destailleur
4d11c8b733 Merge pull request #4212 from frederic34/patch-7
typo
2015-12-13 19:40:08 +01:00
Laurent Destailleur
646a198399 Merge pull request #4214 from frederic34/patch-8
typo
2015-12-13 19:39:56 +01:00
Laurent Destailleur
ef13bd43b0 Fix bad merge 2015-12-13 17:27:55 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
4b741c6b9c Fix permissions 2015-12-13 16:16:30 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
Laurent Destailleur
7db6ac592f FIX Option start tls of ldap was not correctly supported. 2015-12-13 15:51:52 +01:00
Laurent Destailleur
ef33691818 FIX Removed hard coded parameters for asterisk setup 2015-12-13 15:21:46 +01:00
Laurent Destailleur
3680202c1c Fix do not share color for title of table and title of pages 2015-12-13 14:39:12 +01:00
Frédéric FRANCE
9cc77787c5 typo 2015-12-12 16:10:36 +01:00
Laurent Destailleur
2a6fbe3526 Fix debug shipment doc generation (bad position of fields, code
differences, text size, ...)
2015-12-12 14:55:32 +01:00
Laurent Destailleur
0330d8237f Fix: Color too dark 2015-12-12 14:13:45 +01:00
Laurent Destailleur
84205b5be4 Fix: text too long 2015-12-12 14:12:53 +01:00
Laurent Destailleur
5f4be14dd2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-12 13:19:55 +01:00
philippe grand
de0a13ae8f [Qual] Uniformize code 2015-12-12 10:59:02 +01:00
Frédéric FRANCE
442f669dc7 typo 2015-12-12 10:45:33 +01:00
Ion Agorria
57102aefde Price expression selector fix 2015-12-12 01:38:24 +01:00
Juanjo Menent
4b9e87367f Merge pull request #4206 from grandoc/develop
[Qual] Close database handler should be after Footer
2015-12-11 21:35:14 +01:00
Juanjo Menent
9e2a056221 Merge pull request #4205 from FHenry/3.8_accountancy
work on accounting
2015-12-11 19:43:54 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
Ion Agorria
26b85d7cac Remove unnecesary variable 2015-12-11 18:28:55 +01:00
Laurent Destailleur
f71225742a Merge pull request #4178 from GPCsolutions/dolibarr-3953
Better javascript rounding
2015-12-11 17:59:34 +01:00
Laurent Destailleur
519e022c98 Merge pull request #4191 from braito4/patch-1
Update list.php
2015-12-11 17:28:40 +01:00
Laurent Destailleur
da5aa0cd36 Merge pull request #4200 from GPCsolutions/dolibarr-php7
[Qual] OOP constructor
2015-12-11 17:26:08 +01:00
Laurent Destailleur
1a58624775 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-11 17:05:38 +01:00
Laurent Destailleur
f1374625f0 git push origin developMerge branch 'FHenry-develop' into develop 2015-12-11 17:04:58 +01:00
Laurent Destailleur
47fce16778 Merge branch 'develop' of https://github.com/FHenry/dolibarr into
FHenry-develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-12-11 17:04:19 +01:00
Laurent Destailleur
8ac189a1c3 Merge pull request #4199 from grandoc/develop
[Qual] Uniformize code
2015-12-11 16:59:25 +01:00
Laurent Destailleur
793e6e2a8f Example mut be excluded of packages 2015-12-11 16:56:25 +01:00
Laurent Destailleur
42436a37f4 Merge pull request #4194 from GPCsolutions/dolibarr-hidepass
[Security] Hide click to dial password
2015-12-11 16:46:04 +01:00
Laurent Destailleur
b85dd6647d Merge pull request #4175 from frederic34/patch-3
Update paypal.lib.php
2015-12-11 16:44:25 +01:00
Laurent Destailleur
3fea57f83b Merge pull request #4192 from GPCsolutions/3.6-3930
Fix #3930 Removed executable bit
2015-12-11 16:42:25 +01:00
Laurent Destailleur
9c20694668 Merge pull request #4203 from frederic34/patch-5
Update CSMSFile.class.php
2015-12-11 16:39:51 +01:00
Laurent Destailleur
335530b496 Merge pull request #4189 from apachler/develop
added social charges for Austria
2015-12-11 16:39:16 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
philippe grand
9b0dd8159e [Qual] Close database handler should be after Footer 2015-12-11 12:29:19 +01:00
Florian HENRY
8edf3c65c6 work on accounting 2015-12-11 11:46:22 +01:00
Florian HENRY
71d0024b27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-11 11:31:37 +01:00
philippe grand
8ccafc6e36 [Qual] Uniformize code 2015-12-11 09:54:30 +01:00