Commit Graph

1423 Commits

Author SHA1 Message Date
Laurent Destailleur
0314b3b5b1 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
2016-01-02 12:27:08 +01:00
Laurent Destailleur
cfd01b6060 Fix package for 3.8.3 2015-12-27 23:50:13 +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
dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
2015-12-18 21:20:12 +01:00
Laurent Destailleur
c1c0fa88c2 Fix for new travis setup 2015-12-18 20:56:27 +01:00
Laurent Destailleur
b47dc8a394 Fix to use new travis setup 2015-12-18 20:10: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
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
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
793e6e2a8f Example mut be excluded of packages 2015-12-11 16:56:25 +01:00
Raphaël Doursenaud
4e9b339439 [Qual] Removed PHP closing tag 2015-12-09 13:28:45 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
Laurent Destailleur
3df097f4bf Update doc 2015-12-06 14:06:37 +01:00
Laurent Destailleur
f814bc11a0 Clean packaging 2015-11-26 01:27:59 +01:00
Laurent Destailleur
ffeae34f51 Update doc 2015-11-22 18:41:35 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
f49fab8a7e Rename some files in english and increase fields size. 2015-11-09 16:48:30 +01:00
Laurent Destailleur
350345ecca Prepare 3.6.5 2015-11-08 15:18:26 +01:00
Laurent Destailleur
722a133b31 FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.6.5

Conflicts:
	ChangeLog

Conflicts:
	ChangeLog
2015-11-08 15:09:57 +01:00
Laurent Destailleur
d4aeb8b3bc Abandon package APS. Was never used. 2015-11-08 14:57:26 +01:00
Laurent Destailleur
04aba8ce96 Abandon package APS. Was never used. 2015-11-08 14:56:36 +01:00
Laurent Destailleur
9b8bb114cd FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.7.2

Conflicts:
	ChangeLog
2015-11-08 14:55:12 +01:00
Laurent Destailleur
98b887edae Update doc to generate ChangeLog 2015-11-08 12:23:40 +01:00
Laurent Destailleur
42ae4e10b3 Abandon package APS. Was never used. 2015-11-08 12:19:05 +01:00
Laurent Destailleur
972c364c37 FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.8.2
2015-11-08 12:12:28 +01:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Regis Houssin
542ed40c9c Fix: compatibility with dolibarr versions before and after 3.7.1 2015-10-14 12:09:51 +02:00
Laurent Destailleur
df39a1054e Fix 3.8.1 2015-10-11 20:19:52 +02:00
Laurent Destailleur
68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/societe/list.php
2015-10-04 20:57:00 +02:00
Laurent Destailleur
d54650905b FIX debian install when module mysqli is not installed. 2015-10-04 19:08:10 +02:00
Laurent Destailleur
9eab5206d4 Fix typo 2015-10-04 14:08:32 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
Laurent Destailleur
4e5ca151b5 Make process to update launchpad easier. 2015-10-03 20:39:15 +02:00
Laurent Destailleur
bea789edfe Make process to update launchpad easier. 2015-10-03 20:09:54 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
2015-09-27 21:29:16 +02:00
Laurent Destailleur
12a08ae4e1 Prepare 3.8.1 2015-09-23 10:25:06 +02:00
Laurent Destailleur
f81df66564 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/.gitignore
	htdocs/categories/edit.php
2015-09-23 00:34:57 +02:00
Laurent Destailleur
077c696c09 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/.gitignore
	htdocs/theme/.gitignore
2015-09-22 16:28:34 +02:00
Laurent Destailleur
c125ba0d66 Update ignore to secure
Conflicts:
	htdocs/.gitignore
2015-09-22 15:42:59 +02:00
Laurent Destailleur
75daddbbe2 Update ignore to secure 2015-09-22 15:40:49 +02:00
Laurent Destailleur
2ce43dc0d8 Update ignore to secure 2015-09-22 15:40:17 +02:00
Laurent Destailleur
27b1f2ecc6 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-17 19:52:13 +02:00
Laurent Destailleur
8bb832d06b Fix Natural english 2015-09-17 00:48:10 +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
Raphaël Doursenaud
cb31ab3e2b FIX Syntax error in Debian Apache configuration
This issue prevented Apache from starting after dolibarr deb package
installation with the following error:
Syntax error on line 30 of /etc/apache2/conf.d/dolibarr.conf:
order takes one argument, 'allow,deny', 'deny,allow', or 'mutual-failure'
2015-09-16 19:53:32 +02:00
Laurent Destailleur
4eedec0274 Fix tool to generate filecheck 2015-09-13 20:25:33 +02:00
Laurent Destailleur
52aee5562f Update doc 2015-09-03 18:11:26 +02:00