Commit Graph

72577 Commits

Author SHA1 Message Date
Laurent Destailleur
3ddfcbe3bb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +01:00
Laurent Destailleur
da2ba20653 Try fix for postgresql 2019-01-20 20:31:12 +01:00
Laurent Destailleur
e421c68de7 Travis test 2019-01-20 19:45:10 +01:00
Laurent Destailleur
f6821d3fd4 Travis 2019-01-20 19:42:48 +01:00
Laurent Destailleur
ec67838992 Fix travis 2019-01-20 19:28:19 +01:00
Laurent Destailleur
9ffd859830 Fix phpunit 2019-01-20 18:14:51 +01:00
Laurent Destailleur
f7c11ec7f4 Fix unit test on accounting 2019-01-20 17:06:24 +01:00
Laurent Destailleur
24cb6ecf03 Fix travis 2019-01-20 15:37:03 +01:00
Laurent Destailleur
654b025915 Fix bad name 2019-01-20 15:27:20 +01:00
Laurent Destailleur
cdc44ca084 Add log 2019-01-20 15:06:12 +01:00
Laurent Destailleur
2e3f247544 Fix name of module 2019-01-20 15:02:32 +01:00
Laurent Destailleur
6156d04195 Fix init of module list 2019-01-20 14:41:35 +01:00
Laurent Destailleur
abd9686d65 Enable accounting module 2019-01-20 14:25:26 +01:00
Laurent Destailleur
ec0c6985e7 Try to fix error when module not enabled 2019-01-20 13:57:00 +01:00
Laurent Destailleur
51b03e358e Fix phpunit 2019-01-20 13:45:29 +01:00
Laurent Destailleur
168ff1a806 Fix phpcs 2019-01-20 13:22:56 +01:00
Laurent Destailleur
43277cb630 Removed some warning 2019-01-20 13:22:04 +01:00
Laurent Destailleur
9712da21cb Try to fix pgsql connection 2019-01-19 18:00:20 +01:00
Laurent Destailleur
9a6517a3bd Try to trap apache log 2019-01-19 17:38:05 +01:00
Laurent Destailleur
616aa1f81c Fix var not defined 2019-01-19 17:10:14 +01:00
Laurent Destailleur
88635e3099 Try to get log 2019-01-19 16:54:04 +01:00
Laurent Destailleur
9efe103014 Fix travis 2019-01-19 16:44:35 +01:00
Laurent Destailleur
213a5c9d5d Add apache error log 2019-01-19 16:40:36 +01:00
Laurent Destailleur
8569987b60 Fix travis for php 7.3 2019-01-19 16:26:16 +01:00
Laurent Destailleur
4ffd7de9f7 doc 2019-01-19 16:15:05 +01:00
Laurent Destailleur
f311deb405 Fix hash for gol_getprefix must not contains special char. 2019-01-19 16:14:45 +01:00
Laurent Destailleur
a46c90e1e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-19 15:34:01 +01:00
Laurent Destailleur
691deeb2c3 Add php7.3 in phpunit 2019-01-19 15:33:10 +01:00
Laurent Destailleur
5c825310a3 Fix bad link and css 2019-01-19 14:49:44 +01:00
Laurent Destailleur
b1e51835f5 Fix bad link and css 2019-01-19 14:49:26 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
f27f1f9d4a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-19 13:20:46 +01:00
Laurent Destailleur
0e843c56d0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-19 13:20:21 +01:00
Laurent Destailleur
1ac55b0800 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/security2.lib.php
2019-01-19 13:19:58 +01:00
Laurent Destailleur
55c90b0578 Fix #10359 cloning of proposal 2019-01-19 13:17:07 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
ptibogxiv
b3cbbc1b11 FIX lang for dolistore in module.php 2019-01-19 11:41:47 +01:00
Laurent Destailleur
f3d0c365d3
Merge pull request #10374 from ptibogxiv/patch-106
FIX lang for dolistore in module.php
2019-01-19 11:39:34 +01:00
wdammak
aaa61254ac Update stats.class.php
Fix div/0 warnings
2019-01-19 11:36:09 +01:00
wdammak
191900d258 Update stats.class.php
Fix div/0 warnings
2019-01-19 11:35:16 +01:00
wdammak
13e7d18291 Update stats.class.php
Fix div/0 warnings
2019-01-19 11:33:56 +01:00
Laurent Destailleur
22b01739d6
Merge pull request #10372 from wdammak/patch-21
Update stats.class.php
2019-01-19 11:32:16 +01:00
Laurent Destailleur
302a838673
Merge pull request #10365 from ptibogxiv/patch-89
NEW Add option DONATION_USE_THIRDPARTIES in admin of membership module
2019-01-19 11:25:25 +01:00
Laurent Destailleur
b0b7f53994
Merge pull request #10362 from ptibogxiv/patch-87
NEW save and display type of adherent in subscription for more explicit historic
2019-01-19 11:22:41 +01:00
Laurent Destailleur
4cf624e448
Merge pull request #10366 from ptibogxiv/patch-90
Fix: members.lang
2019-01-19 11:20:52 +01:00
ptibogxiv
ff99927f65
FIX lang for dolistore in module.php 2019-01-19 11:18:07 +01:00
Laurent Destailleur
0c452bd4e1
Merge pull request #10364 from ptibogxiv/patch-88
FIX lang libelle in list.php
2019-01-19 11:17:55 +01:00
Laurent Destailleur
6651407a05
Merge pull request #10367 from grandoc/new_branch_18_01_2019
update with html5 compliant code
2019-01-19 11:14:59 +01:00
Laurent Destailleur
325d2130b1
Merge pull request #10371 from ptibogxiv/patch-105
NEW add API REST for donations
2019-01-19 11:14:25 +01:00
wdammak
9f60c208ca
Update stats.class.php
Fix div/0 warnings
2019-01-18 22:25:51 +01:00